diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..72d1288b0
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,11 @@
+lib
+dev
+node_modules
+/coverage/
+/docgen/
+/v1/
+/v2/
+/logger/
+/dist/
+/spec/fixtures
+/scripts/**/*.js
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..f225e5960
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,70 @@
+module.exports = {
+  env: {
+    es6: true,
+    node: true,
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "plugin:jsdoc/recommended",
+    "google",
+    "prettier",
+  ],
+  rules: {
+    "jsdoc/newline-after-description": "off",
+    "jsdoc/require-jsdoc": ["warn", { publicOnly: true }],
+    "no-restricted-globals": ["error", "name", "length"],
+    "prefer-arrow-callback": "error",
+    "prettier/prettier": "error",
+    "require-atomic-updates": "off", // This rule is so noisy and isn't useful: https://github.com/eslint/eslint/issues/11899
+    "require-jsdoc": "off", // This rule is deprecated and superseded by jsdoc/require-jsdoc.
+    "valid-jsdoc": "off", // This is deprecated but included in recommended configs.
+
+    "no-prototype-builtins": "warn",
+    "no-useless-escape": "warn",
+    "prefer-promise-reject-errors": "warn",
+  },
+  overrides: [
+    {
+      files: ["*.ts"],
+      rules: {
+        "jsdoc/require-param-type": "off",
+        "jsdoc/require-returns-type": "off",
+
+        // Google style guide allows us to omit trivial parameters and returns
+        "jsdoc/require-param": "off",
+        "jsdoc/require-returns": "off",
+
+        "@typescript-eslint/no-invalid-this": "error",
+        "@typescript-eslint/no-unused-vars": "error", // Unused vars should not exist.
+        "@typescript-eslint/no-misused-promises": "warn", // rule does not work with async handlers for express.
+        "no-invalid-this": "off", // Turned off in favor of @typescript-eslint/no-invalid-this.
+        "no-unused-vars": "off", // Off in favor of @typescript-eslint/no-unused-vars.
+        eqeqeq: ["error", "always", { null: "ignore" }],
+        camelcase: ["error", { properties: "never" }], // snake_case allowed in properties iif to satisfy an external contract / style
+
+        // Ideally, all these warning should be error - let's fix them in  the future.
+        "@typescript-eslint/no-unsafe-argument": "warn",
+        "@typescript-eslint/no-unsafe-assignment": "warn",
+        "@typescript-eslint/no-unsafe-call": "warn",
+        "@typescript-eslint/no-unsafe-member-access": "warn",
+        "@typescript-eslint/no-unsafe-return": "warn",
+        "@typescript-eslint/restrict-template-expressions": "warn",
+      },
+    },
+    {
+      files: ["*.spec.*"],
+      env: {
+        mocha: true,
+      },
+      rules: {},
+    },
+  ],
+  globals: {},
+  parserOptions: {
+    project: "tsconfig.json",
+  },
+  plugins: ["prettier", "@typescript-eslint", "jsdoc"],
+  parser: "@typescript-eslint/parser",
+};
diff --git a/.github/ISSUE_TEMPLATE/---report-a-bug.md b/.github/ISSUE_TEMPLATE/---report-a-bug.md
index 3ad82bf60..abffad1b7 100644
--- a/.github/ISSUE_TEMPLATE/---report-a-bug.md
+++ b/.github/ISSUE_TEMPLATE/---report-a-bug.md
@@ -1,9 +1,9 @@
 ---
-name: '⚠️ Report a Bug'
+name: "⚠️ Report a Bug"
 about: Think you found a bug in the firebase-functions SDK? Report it here. Please do not use this form if your function is deployed successfully but not working as you expected.
-title: ''
-labels: ''
-assignees: ''
+title: ""
+labels: ""
+assignees: ""
 ---
 
 <!-- DO NOT DELETE
diff --git a/.github/workflows/postmerge.yaml b/.github/workflows/postmerge.yaml
index f5105958c..15835d76a 100644
--- a/.github/workflows/postmerge.yaml
+++ b/.github/workflows/postmerge.yaml
@@ -16,7 +16,7 @@ name: Post-merge tests
 on:
   workflow_dispatch:
   workflow_run:
-    workflows: ['CI Tests']
+    workflows: ["CI Tests"]
     types: [completed]
     branches: [master]
 
@@ -38,16 +38,16 @@ jobs:
 
       - uses: google-github-actions/auth@v0
         with:
-          credentials_json: '${{ secrets.CF3_INTEGRATION_TEST_GOOGLE_CREDENTIALS }}'
+          credentials_json: "${{ secrets.CF3_INTEGRATION_TEST_GOOGLE_CREDENTIALS }}"
           create_credentials_file: true
 
-      - name: 'Set up Cloud SDK'
+      - name: "Set up Cloud SDK"
         uses: google-github-actions/setup-gcloud@v0
 
-      - name: 'Setup Firebase CLI'
+      - name: "Setup Firebase CLI"
         run: npm i -g firebase-tools
 
-      - name: 'Run integration test'
+      - name: "Run integration test"
         run: npm run test:postmerge
 
       - name: Print debug logs
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 33242e9b8..c43cdb089 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,13 +8,28 @@ env:
   CI: true
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    strategy:
+      matrix:
+        node-version:
+          - "16"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - run: npm ci
+      - run: npm run lint
   unit:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version:
-          - 10.x
-          - 12.x
           - 14.x
           - 16.x
     steps:
@@ -22,23 +37,19 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-
       - name: Cache npm
         uses: actions/cache@v1
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-
       - run: npm ci
-      - run: npm run lint
-      - run: npm run format
       - run: npm run test
   integration:
+    needs: "unit"
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version:
-          - 12.x
           - 14.x
           - 16.x
     steps:
@@ -46,12 +57,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-
       - name: Cache npm
         uses: actions/cache@v1
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
-
-      - run: npm install
+      - run: npm ci
       - run: npm run test:bin
diff --git a/.mocharc.yaml b/.mocharc.yaml
index 2bb78edfc..a23d46ad0 100644
--- a/.mocharc.yaml
+++ b/.mocharc.yaml
@@ -4,5 +4,5 @@ extension:
 package: ./package.json
 reporter: spec
 require:
-  - 'ts-node/register'
-  - 'source-map-support/register'
+  - "ts-node/register"
+  - "source-map-support/register"
diff --git a/.prettierignore b/.prettierignore
index de457f940..2011321b8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,4 @@
-lib
-package.json
-spec/fixtures/credential/unparsable.key.json
+/node_modules
+/lib/**/*
+/CONTRIBUTING.md
+/docgen
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 491929e45..000000000
--- a/.prettierrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "arrowParens": "always",
-  "singleQuote": true,
-  "trailingComma": "es5"
-}
diff --git a/.prettierrc.js b/.prettierrc.js
new file mode 100644
index 000000000..d7a429f94
--- /dev/null
+++ b/.prettierrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  printWidth: 100,
+};
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb..ae2bb13ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,32 @@
+### Breaking Changes
+
+- Deprecated `allowInvalidAppCheckToken` option. Instead use
+  `enforceAppCheck`.
+
+> App Check enforcement on callable functions is disabled by default in v4.
+> Requests containing invalid App Check tokens won't be denied unless you
+> explicitly enable App Check enforcement using the new `enforceAppCheck` option.
+> Furthermore, when enforcement is enabled, callable functions will deny
+> all requests without App Check tokens.
+
+- Dropped support for Node.js versions 8, 10, and 12.
+- Dropped support for Admin SDK versions 8 and 9.
+- Removed the `functions.handler` namespace.
+- `DataSnapshot` passed to the Firebase Realtime Database trigger now
+  matches the `DataSnapshot` returned by the Admin SDK, with null values
+  removed.
+- Removed `__trigger` object on function handlers.
+- Reorganized source code location. This affects only apps that directly import files instead of using the recommend entry points specified in the
+- Reworked the `apps` library and removed `lodash` as a runtime dependency.
+
+### Enhancements
+
+- Logs created with the `functions.logger` package in v2 functions
+  are now annotated with each request's trace ID, making it easy to correlate
+  log entries with the incoming request. Trace IDs are especially useful for
+  cases where 2nd gen's concurrency feature permits a function
+  to handle multiple requests at any given time. See
+  [Correlate log entries](https://cloud.google.com/logging/docs/view/correlate-logs) to learn more.
+- `functions.logger.error` now always outputs an error object and is included in Google Cloud Error Reporting.
+- The logging severity of Auth/App Check token validation has changed from `info` to `debug` level.
+- Event parameters for 2nd generation functions are now strongly typed, permitting stronger TypeScript types for matched parameters.
diff --git a/README.md b/README.md
index 33fbaa746..60df9c4d4 100644
--- a/README.md
+++ b/README.md
@@ -23,15 +23,13 @@ _Please avoid double posting across multiple channels!_
 
 ```js
 // functions/index.js
-const functions = require('firebase-functions');
-const notifyUsers = require('./notify-users');
-
-exports.newPost = functions.database
-  .ref('/posts/{postId}')
-  .onCreate((snapshot, context) => {
-    functions.logger.info('Received new post with ID:', context.params.postId);
-    return notifyUsers(snapshot.val());
-  });
+const functions = require("firebase-functions");
+const notifyUsers = require("./notify-users");
+
+exports.newPost = functions.database.ref("/posts/{postId}").onCreate((snapshot, context) => {
+  functions.logger.info("Received new post with ID:", context.params.postId);
+  return notifyUsers(snapshot.val());
+});
 ```
 
 ## Contributing
diff --git a/docgen/api-extractor.base.json b/docgen/api-extractor.base.json
index 2938a396f..869c825d6 100644
--- a/docgen/api-extractor.base.json
+++ b/docgen/api-extractor.base.json
@@ -1,364 +1,364 @@
-/**
- * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
- */
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-
-  /**
-   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
-   * standard settings to be shared across multiple projects.
-   *
-   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
-   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
-   * resolved using NodeJS require().
-   *
-   * SUPPORTED TOKENS: none
-   * DEFAULT VALUE: ""
-   */
-  // "extends": "./shared/api-extractor-base.json"
-  // "extends": "my-package/include/api-extractor-base.json"
-
-  /**
-   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
-   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting.
-   *
-   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
-   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
-   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
-   * will be reported.
-   *
-   * SUPPORTED TOKENS: <lookup>
-   * DEFAULT VALUE: "<lookup>"
-   */
-  "projectFolder": "..",
-
-  /**
-   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
-   * analyzes the symbols exported by this module.
-   *
-   * The file extension must be ".d.ts" and not ".ts".
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-   * prepend a folder token such as "<projectFolder>".
-   *
-   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-   */
-  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
-
-  /**
-   * A list of NPM package names whose exports should be treated as part of this package.
-   *
-   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
-   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
-   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
-   * imports library2.  To avoid this, we can specify:
-   *
-   *   "bundledPackages": [ "library2" ],
-   *
-   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
-   * local files for library1.
-   */
-  "bundledPackages": [],
-
-  /**
-   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
-   */
-  "compiler": {
-    /**
-     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * Note: This setting will be ignored if "overrideTsconfig" is used.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
-     */
-    "tsconfigFilePath": "<projectFolder>/tsconfig.release.json"
-    /**
-     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
-     * The object must conform to the TypeScript tsconfig schema:
-     *
-     * http://json.schemastore.org/tsconfig
-     *
-     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
-     *
-     * DEFAULT VALUE: no overrideTsconfig section
-     */
-    // "overrideTsconfig": {
-    //   . . .
-    // }
-    /**
-     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
-     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
-     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
-     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "skipLibCheck": true,
-  },
-
-  /**
-   * Configures how the API report file (*.api.md) will be generated.
-   */
-  "apiReport": {
-    /**
-     * (REQUIRED) Whether to generate an API report.
-     */
-    "enabled": true,
-
-    /**
-     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
-     * a full file path.
-     *
-     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
-     *
-     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
-     */
-    // "reportFileName": "<unscopedPackageName>.api.md",
-
-    /**
-     * Specifies the folder where the API report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
-     * e.g. for an API review.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/etc/"
-     */
-    "reportFolder": "<projectFolder>/docgen/etc/",
-
-    /**
-     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
-     * If they are different, a production build will fail.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/"
-     */
-    "reportTempFolder": "<projectFolder>/docgen/temp/"
-  },
-
-  /**
-   * Configures how the doc model file (*.api.json) will be generated.
-   */
-  "docModel": {
-    /**
-     * (REQUIRED) Whether to generate a doc model file.
-     */
-    "enabled": true,
-
-    /**
-     * The output path for the doc model file.  The file extension should be ".api.json".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
-     */
-    "apiJsonFilePath": "<projectFolder>/docgen/<unscopedPackageName>.api.json"
-  },
-
-  /**
-   * Configures how the .d.ts rollup file will be generated.
-   */
-  "dtsRollup": {
-    /**
-     * (REQUIRED) Whether to generate the .d.ts rollup file.
-     */
-    "enabled": true
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
-     * This file will include all declarations that are exported by the main entry point.
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
-     */
-    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
-     * This file will include only declarations that are marked as "@public" or "@beta".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
-     * This file will include only declarations that are marked as "@public".
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
-
-    /**
-     * When a declaration is trimmed, by default it will be replaced by a code comment such as
-     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
-     * declaration completely.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "omitTrimmingComments": true
-  },
-
-  /**
-   * Configures how the tsdoc-metadata.json file will be generated.
-   */
-  "tsdocMetadata": {
-    /**
-     * Whether to generate the tsdoc-metadata.json file.
-     *
-     * DEFAULT VALUE: true
-     */
-    // "enabled": true,
-    /**
-     * Specifies where the TSDoc metadata file should be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
-     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
-     * falls back to "tsdoc-metadata.json" in the package folder.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<lookup>"
-     */
-    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
-  },
-
-  /**
-   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
-   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
-   * To use the OS's default newline kind, specify "os".
-   *
-   * DEFAULT VALUE: "crlf"
-   */
-  // "newlineKind": "crlf",
-
-  /**
-   * Configures how API Extractor reports error and warning messages produced during analysis.
-   *
-   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
-   */
-  "messages": {
-    /**
-     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
-     * the input .d.ts files.
-     *
-     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "compilerMessageReporting": {
-      /**
-       * Configures the default routing for messages that don't match an explicit rule in this table.
-       */
-      "default": {
-        /**
-         * Specifies whether the message should be written to the the tool's output log.  Note that
-         * the "addToApiReportFile" property may supersede this option.
-         *
-         * Possible values: "error", "warning", "none"
-         *
-         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
-         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
-         * the "--local" option), the warning is displayed but the build will not fail.
-         *
-         * DEFAULT VALUE: "warning"
-         */
-        "logLevel": "warning"
-
-        /**
-         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
-         * then the message will be written inside that file; otherwise, the message is instead logged according to
-         * the "logLevel" option.
-         *
-         * DEFAULT VALUE: false
-         */
-        // "addToApiReportFile": false
-      }
-
-      // "TS2551": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by API Extractor during its analysis.
-     *
-     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
-     *
-     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
-     */
-    "extractorMessageReporting": {
-      "default": {
-        "logLevel": "warning"
-        // "addToApiReportFile": false
-      }
-
-      // "ae-extra-release-tag": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
-     *
-     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "tsdocMessageReporting": {
-      "default": {
-        "logLevel": "warning"
-        // "addToApiReportFile": false
-      }
-
-      // "tsdoc-link-tag-unescaped-text": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    }
-  }
-}
+/**
+ * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
+ */
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+
+  /**
+   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
+   * standard settings to be shared across multiple projects.
+   *
+   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
+   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
+   * resolved using NodeJS require().
+   *
+   * SUPPORTED TOKENS: none
+   * DEFAULT VALUE: ""
+   */
+  // "extends": "./shared/api-extractor-base.json"
+  // "extends": "my-package/include/api-extractor-base.json"
+
+  /**
+   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
+   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting.
+   *
+   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
+   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
+   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
+   * will be reported.
+   *
+   * SUPPORTED TOKENS: <lookup>
+   * DEFAULT VALUE: "<lookup>"
+   */
+  "projectFolder": "..",
+
+  /**
+   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
+   * analyzes the symbols exported by this module.
+   *
+   * The file extension must be ".d.ts" and not ".ts".
+   *
+   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+   * prepend a folder token such as "<projectFolder>".
+   *
+   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+   */
+  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+
+  /**
+   * A list of NPM package names whose exports should be treated as part of this package.
+   *
+   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
+   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
+   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
+   * imports library2.  To avoid this, we can specify:
+   *
+   *   "bundledPackages": [ "library2" ],
+   *
+   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
+   * local files for library1.
+   */
+  "bundledPackages": [],
+
+  /**
+   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
+   */
+  "compiler": {
+    /**
+     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * Note: This setting will be ignored if "overrideTsconfig" is used.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
+     */
+    "tsconfigFilePath": "<projectFolder>/tsconfig.release.json"
+    /**
+     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
+     * The object must conform to the TypeScript tsconfig schema:
+     *
+     * http://json.schemastore.org/tsconfig
+     *
+     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
+     *
+     * DEFAULT VALUE: no overrideTsconfig section
+     */
+    // "overrideTsconfig": {
+    //   . . .
+    // }
+    /**
+     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
+     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
+     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
+     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "skipLibCheck": true,
+  },
+
+  /**
+   * Configures how the API report file (*.api.md) will be generated.
+   */
+  "apiReport": {
+    /**
+     * (REQUIRED) Whether to generate an API report.
+     */
+    "enabled": true,
+
+    /**
+     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
+     * a full file path.
+     *
+     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
+     *
+     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
+     */
+    // "reportFileName": "<unscopedPackageName>.api.md",
+
+    /**
+     * Specifies the folder where the API report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
+     * e.g. for an API review.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/etc/"
+     */
+    "reportFolder": "<projectFolder>/docgen/etc/",
+
+    /**
+     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
+     * the "reportFileName" setting.
+     *
+     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
+     * If they are different, a production build will fail.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/"
+     */
+    "reportTempFolder": "<projectFolder>/docgen/temp/"
+  },
+
+  /**
+   * Configures how the doc model file (*.api.json) will be generated.
+   */
+  "docModel": {
+    /**
+     * (REQUIRED) Whether to generate a doc model file.
+     */
+    "enabled": true,
+
+    /**
+     * The output path for the doc model file.  The file extension should be ".api.json".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
+     */
+    "apiJsonFilePath": "<projectFolder>/docgen/<unscopedPackageName>.api.json"
+  },
+
+  /**
+   * Configures how the .d.ts rollup file will be generated.
+   */
+  "dtsRollup": {
+    /**
+     * (REQUIRED) Whether to generate the .d.ts rollup file.
+     */
+    "enabled": true
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
+     * This file will include all declarations that are exported by the main entry point.
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
+     */
+    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
+     * This file will include only declarations that are marked as "@public" or "@beta".
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
+
+    /**
+     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
+     * This file will include only declarations that are marked as "@public".
+     *
+     * If the path is an empty string, then this file will not be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: ""
+     */
+    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
+
+    /**
+     * When a declaration is trimmed, by default it will be replaced by a code comment such as
+     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
+     * declaration completely.
+     *
+     * DEFAULT VALUE: false
+     */
+    // "omitTrimmingComments": true
+  },
+
+  /**
+   * Configures how the tsdoc-metadata.json file will be generated.
+   */
+  "tsdocMetadata": {
+    /**
+     * Whether to generate the tsdoc-metadata.json file.
+     *
+     * DEFAULT VALUE: true
+     */
+    // "enabled": true,
+    /**
+     * Specifies where the TSDoc metadata file should be written.
+     *
+     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
+     * prepend a folder token such as "<projectFolder>".
+     *
+     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
+     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
+     * falls back to "tsdoc-metadata.json" in the package folder.
+     *
+     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
+     * DEFAULT VALUE: "<lookup>"
+     */
+    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
+  },
+
+  /**
+   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
+   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
+   * To use the OS's default newline kind, specify "os".
+   *
+   * DEFAULT VALUE: "crlf"
+   */
+  // "newlineKind": "crlf",
+
+  /**
+   * Configures how API Extractor reports error and warning messages produced during analysis.
+   *
+   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
+   */
+  "messages": {
+    /**
+     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
+     * the input .d.ts files.
+     *
+     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "compilerMessageReporting": {
+      /**
+       * Configures the default routing for messages that don't match an explicit rule in this table.
+       */
+      "default": {
+        /**
+         * Specifies whether the message should be written to the the tool's output log.  Note that
+         * the "addToApiReportFile" property may supersede this option.
+         *
+         * Possible values: "error", "warning", "none"
+         *
+         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
+         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
+         * the "--local" option), the warning is displayed but the build will not fail.
+         *
+         * DEFAULT VALUE: "warning"
+         */
+        "logLevel": "warning"
+
+        /**
+         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
+         * then the message will be written inside that file; otherwise, the message is instead logged according to
+         * the "logLevel" option.
+         *
+         * DEFAULT VALUE: false
+         */
+        // "addToApiReportFile": false
+      }
+
+      // "TS2551": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by API Extractor during its analysis.
+     *
+     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
+     *
+     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
+     */
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+        // "addToApiReportFile": false
+      }
+
+      // "ae-extra-release-tag": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    },
+
+    /**
+     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
+     *
+     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
+     *
+     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
+     */
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+        // "addToApiReportFile": false
+      }
+
+      // "tsdoc-link-tag-unescaped-text": {
+      //   "logLevel": "warning",
+      //   "addToApiReportFile": true
+      // },
+      //
+      // . . .
+    }
+  }
+}
diff --git a/docgen/api-extractor.v1.json b/docgen/api-extractor.v1.json
index f03058f13..880990ee1 100644
--- a/docgen/api-extractor.v1.json
+++ b/docgen/api-extractor.v1.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "extends": "./api-extractor.base.json",
-  "mainEntryPointFilePath": "<projectFolder>/lib/index.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/lib/v1/index.d.ts",
   "docModel": {
     "enabled": true,
     "apiJsonFilePath": "<projectFolder>/docgen/v1/firebase-functions.api.json"
diff --git a/docgen/generate-docs.js b/docgen/generate-docs.js
deleted file mode 100644
index bf07f3881..000000000
--- a/docgen/generate-docs.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const { exec } = require('child-process-promise');
-const fs = require('mz/fs');
-const path = require('path');
-const yargs = require('yargs');
-const yaml = require('js-yaml');
-
-const repoPath = path.resolve(`${__dirname}/..`);
-
-// Command-line options.
-const { api: apiVersion } = yargs
-  .option('api', {
-    default: 'v1',
-    describe: 'Typescript source file(s)',
-    type: 'string',
-  })
-  .version(false)
-  .help().argv;
-
-let sourceFile, devsitePath, exclude;
-switch (apiVersion) {
-  case 'v1':
-    sourceFile = `${repoPath}/src`;
-    devsitePath = '/docs/reference/functions/';
-    exclude = ['"**/v2/**/*.ts"', '"src/index.ts"'];
-    break;
-  case 'v2':
-    sourceFile = `${repoPath}/src/{v2,logger}`;
-    devsitePath = '/docs/functions/alpha/';
-    exclude = [];
-    break;
-  default:
-    throw new Error(
-      `Unrecognized version ${apiVersion}, must be one of v1 or v2`
-    );
-}
-
-const docPath = path.resolve(`${__dirname}/html`);
-const contentPath = path.resolve(`${__dirname}/content-sources/${apiVersion}`);
-const tempHomePath = path.resolve(`${contentPath}/HOME_TEMP.md`);
-
-const { JSDOM } = require('jsdom');
-
-const typeMap = require('./type-aliases.json');
-const { existsSync } = require('fs');
-
-/**
- * Strips path prefix and returns only filename.
- * @param {string} path
- */
-function stripPath(path) {
-  const parts = path.split('/');
-  return parts[parts.length - 1];
-}
-
-/**
- * Runs Typedoc command.
- *
- * Additional config options come from ./typedoc.js
- */
-function runTypedoc() {
-  const command = `${repoPath}/node_modules/.bin/typedoc ${sourceFile} \
-  --out ${docPath} \
-  ${exclude.map(ex => "--exclude " + ex).join(" ")} \
-  --readme ${tempHomePath} \
-  --options ${__dirname}/typedoc.js \
-  --theme ${__dirname}/theme`;
-
-  console.log('Running command:\n', command);
-  return exec(command);
-}
-
-/**
- * Moves files from subdir to root.
- * @param {string} subdir Subdir to move files out of.
- */
-async function moveFilesToRoot(subdir) {
-  if (existsSync(`${docPath}/${subdir}`)) {
-    await exec(`mv ${docPath}/${subdir}/* ${docPath}`);
-    await exec(`rmdir ${docPath}/${subdir}`);
-  }
-}
-
-/**
- * Renames files to remove the leading underscores.
- * We need to do this because devsite hides these files.
- * Example:
- * _cloud_functions_.resource.html => cloud_functions_.resource.html
- */
-async function renameFiles() {
-  const files = await fs.readdir(docPath);
-  const renames = [];
-  for (const file of files) {
-    if (file.startsWith('_') && file.endsWith('html')) {
-      let newFileName = file.substring(1);
-      renames.push(
-        fs.rename(`${docPath}/${file}`, `${docPath}/${newFileName}`)
-      );
-    }
-  }
-  await Promise.all(renames);
-}
-
-/**
- * Reformat links to match flat structure.
- * @param {string} file File to fix links in.
- */
-async function fixLinks(file) {
-  let data = await fs.readFile(file, 'utf8');
-  data = addTypeAliasLinks(data);
-  const flattenedLinks = data
-    .replace(/\.\.\//g, '')
-    .replace(/(modules|interfaces|classes)\//g, '')
-    .replace(/\"_/g, '"');
-  let caseFixedLinks = flattenedLinks;
-  for (const lower in lowerToUpperLookup) {
-    const re = new RegExp(lower, 'g');
-    caseFixedLinks = caseFixedLinks.replace(re, lowerToUpperLookup[lower]);
-  }
-  return fs.writeFile(file, caseFixedLinks);
-}
-
-/**
- * Adds links to external documentation for type aliases that
- * reference an external library.
- *
- * @param data File data to add external library links to.
- */
-function addTypeAliasLinks(data) {
-  const htmlDom = new JSDOM(data);
-  /**
-   * Select .tsd-signature-type because all potential external
-   * links will have this identifier.
-   */
-  const fileTags = htmlDom.window.document.querySelectorAll(
-    '.tsd-signature-type'
-  );
-  for (const tag of fileTags) {
-    const mapping = typeMap[tag.textContent];
-    if (mapping) {
-      console.log('Adding link to ' + tag.textContent + ' documentation.');
-
-      // Add the corresponding document link to this type
-      const linkChild = htmlDom.window.document.createElement('a');
-      linkChild.setAttribute('href', mapping);
-      linkChild.textContent = tag.textContent;
-      tag.textContent = null;
-      tag.appendChild(linkChild);
-    }
-  }
-  return htmlDom.serialize();
-}
-
-/**
- * Generates temporary markdown file that will be sourced by Typedoc to
- * create index.html.
- *
- * @param {string} tocRaw
- * @param {string} homeRaw
- */
-function generateTempHomeMdFile(tocRaw, homeRaw) {
-  const { toc } = yaml.safeLoad(tocRaw);
-  let tocPageLines = [homeRaw, '# API Reference'];
-  for (const group of toc) {
-    tocPageLines.push(`\n## [${group.title}](${stripPath(group.path)})`);
-    const section = group.section || [];
-    for (const item of section) {
-      tocPageLines.push(`- [${item.title}](${stripPath(item.path)})`);
-    }
-  }
-  return fs.writeFile(tempHomePath, tocPageLines.join('\n'));
-}
-
-/**
- * Mapping between lowercase file name and correctly cased name.
- * Used to update links when filenames are capitalized.
- */
-const lowerToUpperLookup = {};
-
-/**
- * Checks to see if any files listed in toc.yaml were not generated.
- * If files exist, fixes filename case to match toc.yaml version.
- */
-async function checkForMissingFilesAndFixFilenameCase(tocText) {
-  // Get filenames from toc.yaml.
-  const filenames = tocText
-    .split('\n')
-    .filter((line) => line.includes('path:'))
-    .map((line) => {
-      parts = line.split('/');
-      return parts[parts.length - 1].replace(/#.*$/, '');
-    });
-  // Logs warning to console if a file from TOC is not found.
-  const fileCheckPromises = filenames.map(async (filename) => {
-    // Warns if file does not exist, fixes filename case if it does.
-    // Preferred filename for devsite should be capitalized and taken from
-    // toc.yaml.
-    const tocFilePath = `${docPath}/${filename}`;
-    // Generated filename from Typedoc will be lowercase.
-    const generatedFilePath = `${docPath}/${filename.toLowerCase()}`;
-    if (await fs.exists(generatedFilePath)) {
-      // Store in a lookup table for link fixing.
-      lowerToUpperLookup[filename.toLowerCase()] = filename;
-      return fs.rename(generatedFilePath, tocFilePath);
-    } else {
-      console.warn(
-        `Missing file: ${filename} requested ` +
-          `in toc.yaml but not found in ${docPath}`
-      );
-    }
-  });
-  await Promise.all(fileCheckPromises);
-  return filenames;
-}
-
-/**
- * Gets a list of html files in generated dir and checks if any are not
- * found in toc.yaml.
- * Option to remove the file if not found (used for node docs).
- *
- * @param {Array} filenamesFromToc Filenames pulled from toc.yaml
- * @param {boolean} shouldRemove Should just remove the file
- */
-async function checkForUnlistedFiles(filenamesFromToc, shouldRemove) {
-  const files = await fs.readdir(docPath);
-  const htmlFiles = files.filter((filename) => filename.slice(-4) === 'html');
-  const removePromises = [];
-  const filesToRemove = htmlFiles
-    .filter((filename) => !filenamesFromToc.includes(filename))
-    .filter((filename) => filename !== 'index' && filename != 'globals');
-  if (filesToRemove.length && !shouldRemove) {
-    // This is just a warning, it doesn't need to finish before
-    // the process continues.
-    console.warn(
-      `Unlisted files: ${filesToRemove.join(', ')} generated ` +
-        `but not listed in toc.yaml.`
-    );
-    return htmlFiles;
-  }
-
-  await Promise.all(
-    filesToRemove.map((filename) => {
-      console.log(`REMOVING ${docPath}/${filename} - not listed in toc.yaml.`);
-      return fs.unlink(`${docPath}/${filename})`);
-    })
-  );
-  return htmlFiles.filter((filename) => filenamesFromToc.includes(filename));
-}
-
-/**
- * Writes a _toc_autogenerated.yaml as a record of all files that were
- * autogenerated.  Helpful to tech writers.
- *
- * @param {Array} htmlFiles List of html files found in generated dir.
- */
-async function writeGeneratedFileList(htmlFiles) {
-  const fileList = htmlFiles.map((filename) => {
-    return {
-      title: filename,
-      path: `${devsitePath}${filename}`,
-    };
-  });
-  const generatedTocYAML = yaml.safeDump({ toc: fileList });
-  await fs.writeFile(`${docPath}/_toc_autogenerated.yaml`, generatedTocYAML);
-  return htmlFiles;
-}
-
-/**
- * Fix all links in generated files to other generated files to point to top
- * level of generated docs dir.
- *
- * @param {Array} htmlFiles List of html files found in generated dir.
- */
-function fixAllLinks(htmlFiles) {
-  const writePromises = [];
-  for (const file of htmlFiles) {
-    // Update links in each html file to match flattened file structure.
-    writePromises.push(fixLinks(`${docPath}/${file}`));
-  }
-  return Promise.all(writePromises);
-}
-
-/**
- * Main document generation process.
- *
- * Steps for generating documentation:
- * 1) Create temporary md file as source of homepage.
- * 2) Run Typedoc, sourcing index.d.ts for API content and temporary md file
- *    for index.html content.
- * 3) Write table of contents file.
- * 4) Flatten file structure by moving all items up to root dir and fixing
- *    links as needed.
- * 5) Check for mismatches between TOC list and generated file list.
- */
-(async function () {
-  try {
-    const [tocRaw, homeRaw] = await Promise.all([
-      fs.readFile(`${contentPath}/toc.yaml`, 'utf8'),
-      fs.readFile(`${contentPath}/HOME.md`, 'utf8'),
-    ]);
-
-    // Run main Typedoc process (uses index.d.ts and generated temp file above).
-    await generateTempHomeMdFile(tocRaw, homeRaw);
-    const output = await runTypedoc();
-
-    // Typedoc output.
-    console.log(output.stdout);
-    await Promise.all([
-      // Clean up temp home markdown file. (Nothing needs to wait for this.)
-      fs.unlink(tempHomePath),
-
-      // Devsite doesn't like css.map files.
-      // NOTE: This doesn't seem to actually get generated anymore, but we'll keep this here just in case.
-      async () => {
-        const cssMap = `${docPath}/assets/css/main.css.map`;
-        if (await fs.exists(cssMap)) {
-          await fs.unlink();
-        }
-      },
-
-      // Write out TOC file.  Do this after Typedoc step to prevent Typedoc
-      // erroring when it finds an unexpected file in the target dir.
-      fs.writeFile(`${docPath}/_toc.yaml`, tocRaw),
-    ]);
-
-    // Flatten file structure. These categories don't matter to us and it makes
-    // it easier to manage the docs directory.
-    await Promise.all([
-      moveFilesToRoot('classes'),
-      moveFilesToRoot('modules'),
-      moveFilesToRoot('interfaces'),
-    ]);
-    // Rename files to remove the underscores since devsite hides those.
-    await renameFiles();
-
-    // Check for files listed in TOC that are missing and warn if so.
-    // Not blocking.
-    const filenamesFromToc = await checkForMissingFilesAndFixFilenameCase(
-      tocRaw
-    );
-
-    // Check for files that exist but aren't listed in the TOC and warn.
-    // (If API is node, actually remove the file.)
-    // Removal is blocking, warnings aren't.
-    const htmlFiles = await checkForUnlistedFiles(filenamesFromToc, false);
-
-    // Write a _toc_autogenerated.yaml to record what files were created.
-    const fileList = await writeGeneratedFileList(htmlFiles);
-
-    // Correct the links in all the generated html files now that files have
-    // all been moved to top level.
-    await fixAllLinks(fileList);
-    const data = await fs.readFile(`${docPath}/index.html`, 'utf8');
-    // String to include devsite local variables.
-    const localVariablesIncludeString = `{% include "docs/web/_local_variables.html" %}\n`;
-    await fs.writeFile(
-      `${docPath}/index.html`,
-      localVariablesIncludeString + data
-    );
-  } catch (err) {
-    if (err.stdout) {
-      console.error(err.stdout);
-    } else {
-      console.error(err);
-    }
-  }
-})();
diff --git a/docgen/toc.ts b/docgen/toc.ts
index 24cc58092..0b5d862b2 100644
--- a/docgen/toc.ts
+++ b/docgen/toc.ts
@@ -1,100 +1,134 @@
-/**
- * @license
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /**
  * Forked of https://github.com/firebase/firebase-js-sdk/blob/5ce06766303b92fea969c58172a7c1ab8695e21e/repo-scripts/api-documenter/src/toc.ts.
+ *
+ * Firebase Functions SDK uses namespaces as primary entry points but the theoriginal Firebase api-documenter ignores
+ * them when generating toc.yaml. A small modification is made to include namespaces and exclude classes when walking
+ * down the api model.
  */
-import { writeFileSync } from 'fs';
-import { resolve } from 'path';
-
-import { FileSystem } from '@rushstack/node-core-library';
 import * as yaml from 'js-yaml';
+import {ApiItem, ApiItemKind, ApiModel, ApiPackage, ApiParameterListMixin,} from 'api-extractor-model-me';
+import {ModuleSource} from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference';
+import {FileSystem, PackageName} from '@rushstack/node-core-library';
 import yargs from 'yargs';
+import {writeFileSync} from 'fs';
+import {join, resolve} from 'path';
+
+function getSafeFileName(f: string): string {
+  return f.replace(/[^a-z0-9_\-\.]/gi, '_').toLowerCase();
+}
+
+export function getFilenameForApiItem(
+  apiItem: ApiItem,
+  addFileNameSuffix: boolean
+): string {
+  if (apiItem.kind === ApiItemKind.Model) {
+    return 'index.md';
+  }
+
+  let baseName: string = '';
+  let multipleEntryPoints: boolean = false;
+  for (const hierarchyItem of apiItem.getHierarchy()) {
+    // For overloaded methods, add a suffix such as "MyClass.myMethod_2".
+    let qualifiedName = getSafeFileName(hierarchyItem.displayName);
+    if (ApiParameterListMixin.isBaseClassOf(hierarchyItem)) {
+      if (hierarchyItem.overloadIndex > 1) {
+        // Subtract one for compatibility with earlier releases of API Documenter.
+        // (This will get revamped when we fix GitHub issue #1308)
+        qualifiedName += `_${hierarchyItem.overloadIndex - 1}`;
+      }
+    }
+
+    switch (hierarchyItem.kind) {
+      case ApiItemKind.Model:
+        break;
+      case ApiItemKind.EntryPoint:
+        const packageName: string = hierarchyItem.parent!.displayName;
+        let entryPointName: string = PackageName.getUnscopedName(packageName);
+        if (multipleEntryPoints) {
+          entryPointName = `${PackageName.getUnscopedName(packageName)}/${
+            hierarchyItem.displayName
+          }`;
+        }
+        baseName = getSafeFileName(entryPointName);
+        break;
+      case ApiItemKind.Package:
+        baseName = getSafeFileName(
+          PackageName.getUnscopedName(hierarchyItem.displayName)
+        );
+        if ((hierarchyItem as ApiPackage).entryPoints.length > 1) {
+          multipleEntryPoints = true;
+        }
+        break;
+      case ApiItemKind.Namespace:
+        baseName += '.' + qualifiedName;
+        if (addFileNameSuffix) {
+          baseName += '_n';
+        }
+        break;
+      case ApiItemKind.Class:
+      case ApiItemKind.Interface:
+        baseName += '.' + qualifiedName;
+        break;
+    }
+  }
+  return baseName + '.md';
+}
 
-export interface TocGenerationOptions {
+export interface ITocGenerationOptions {
   inputFolder: string;
-  outputFolder: string;
   g3Path: string;
+  outputFolder: string;
+  addFileNameSuffix: boolean;
 }
 
-interface TocItem {
+interface ITocItem {
   title: string;
   path: string;
-  section?: TocItem[];
-  status?: 'experimental';
-}
-
-function fileExt(f: string) {
-  const parts = f.split('.');
-  if (parts.length < 2) {
-    return '';
-  }
-  return parts.pop();
+  section?: ITocItem[];
 }
 
 export function generateToc({
   inputFolder,
   g3Path,
   outputFolder,
-}: TocGenerationOptions) {
-  const asObj = FileSystem.readFolder(inputFolder)
-    .filter((f) => fileExt(f) === 'md')
-    .reduce((acc, f) => {
-      const parts = f.split('.');
-      parts.pop(); // Get rid of file extenion (.md)
-
-      let cursor = acc;
-      for (const p of parts) {
-        cursor[p] = cursor[p] || {};
-        cursor = cursor[p];
-      }
-      return acc;
-    }, {} as any);
-
-  function toToc(obj, prefix = ''): TocItem[] {
-    const toc: TocItem[] = [];
-    for (const key of Object.keys(obj)) {
-      const path = prefix?.length ? `${prefix}.${key}` : key;
-      const section = toToc(obj[key], path);
-      const tic: TocItem = {
-        title: key,
-        path: `${g3Path}/${path}.md`,
-      };
-      if (section.length > 0) {
-        tic.section = section;
-      }
-      toc.push(tic);
+  addFileNameSuffix,
+}: ITocGenerationOptions) {
+  const apiModel: ApiModel = new ApiModel();
+
+  for (const filename of FileSystem.readFolder(inputFolder)) {
+    if (filename.match(/\.api\.json$/i)) {
+      const filenamePath = join(inputFolder, filename);
+      apiModel.loadPackage(filenamePath);
     }
-    return toc;
   }
 
-  const toc: TocItem[] = [
-    {
-      title: 'firebase-functions',
-      status: 'experimental',
-      path: `${g3Path}/firebase-functions.md`,
-    },
-    ...toToc(asObj['firebase-functions'], 'firebase-functions'),
-  ];
+  // Firebase Functions only have 1 entry point. Let's traverse the tree to find it.
+  const apiItems: ApiItem[] = [];
+  let cursor = apiModel as ApiItem;
+  while (cursor?.kind !== ApiItemKind.EntryPoint) {
+    apiItems.push(...cursor.members);
+    cursor = apiItems.pop();
+  }
+  if (!cursor) {
+    throw new Error("Couldn't find entry point from api model. Are you sure you've generated the api model?")
+  }
+
+  const entryPointName = (
+      cursor.canonicalReference.source! as ModuleSource
+  ).escapedPath.replace('@firebase/', '');
+
+  const entryPointToc: ITocItem = {
+    title: entryPointName,
+    path: `${g3Path}/${getFilenameForApiItem(cursor, addFileNameSuffix)}`,
+    section: [],
+  };
+
+  generateTocRecursively(cursor, g3Path, addFileNameSuffix, entryPointToc);
 
   writeFileSync(
     resolve(outputFolder, 'toc.yaml'),
     yaml.dump(
-      { toc },
+      { toc: entryPointToc },
       {
         quotingType: '"',
       }
@@ -102,6 +136,37 @@ export function generateToc({
   );
 }
 
+function generateTocRecursively(
+  apiItem: ApiItem,
+  g3Path: string,
+  addFileNameSuffix: boolean,
+  toc: ITocItem
+) {
+    for (const member of apiItem.members) {
+      // only namespaces/classes gets included in ToC.
+      if (
+          [
+              ApiItemKind.Class,
+              ApiItemKind.Namespace,
+              ApiItemKind.Interface,
+          ].includes(member.kind)
+      ) {
+        const fileName = getFilenameForApiItem(member, addFileNameSuffix);
+        const title =
+          member.displayName[0].toUpperCase() + member.displayName.slice(1);
+        const section: ITocItem = {
+          title,
+          path: `${g3Path}/${fileName}`,
+        }
+        if (!toc.section) {
+          toc.section = [];
+        }
+        toc.section.push(section);
+        generateTocRecursively(member, g3Path, addFileNameSuffix, section);
+      }
+    }
+}
+
 const { input, output, path } = yargs(process.argv.slice(2))
   .option('input', {
     alias: 'i',
@@ -121,4 +186,9 @@ const { input, output, path } = yargs(process.argv.slice(2))
   .help().argv;
 
 FileSystem.ensureFolder(output);
-generateToc({ inputFolder: input, g3Path: path, outputFolder: output });
+generateToc({
+  inputFolder: input,
+  g3Path: path,
+  outputFolder: output,
+  addFileNameSuffix: false,
+});
diff --git a/docgen/type-aliases.json b/docgen/type-aliases.json
deleted file mode 100644
index 240c50269..000000000
--- a/docgen/type-aliases.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "firebase.firestore.DocumentSnapshot": "https://googleapis.dev/nodejs/firestore/latest/DocumentSnapshot.html",
-  "firebase.auth.UserRecord": "https://firebase.google.com/docs/reference/admin/node/admin.auth.UserRecord.html",
-  "firebase.auth.UserInfo": "https://firebase.google.com/docs/reference/admin/node/admin.auth.UserInfo.html"
-}
diff --git a/docgen/typedoc.js b/docgen/typedoc.js
deleted file mode 100644
index 332e19b0f..000000000
--- a/docgen/typedoc.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const options = {
-  tsconfig: '../tsconfig.release.json',
-  excludeExternals: true,
-  exclude: ['../spec/**/*.ts', '../integration_test/**/*.ts'],
-  name: 'Firebase Functions SDK',
-  hideGenerator: true,
-};
-
-module.exports = options;
diff --git a/integration_test/firebase.json b/integration_test/firebase.json
index 382d79c84..9662aef03 100644
--- a/integration_test/firebase.json
+++ b/integration_test/firebase.json
@@ -7,6 +7,8 @@
     "indexes": "firestore.indexes.json"
   },
   "functions": {
+    "source": "functions",
+    "codebase": "integration-tests",
     "predeploy": ["npm --prefix \"$RESOURCE_DIR\" run build"]
   }
 }
diff --git a/integration_test/functions/src/index.ts b/integration_test/functions/src/index.ts
index 43378bf42..623b690c7 100644
--- a/integration_test/functions/src/index.ts
+++ b/integration_test/functions/src/index.ts
@@ -1,37 +1,35 @@
-import { PubSub } from '@google-cloud/pubsub';
-import { Request, Response } from 'express';
-import * as admin from 'firebase-admin';
-import * as functions from 'firebase-functions';
-import * as fs from 'fs';
-import { GoogleAuth } from 'google-auth-library';
-import fetch from 'node-fetch';
+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";
+import * as fs from "fs";
+import fetch from "node-fetch";
 
-import * as v1 from './v1';
-import * as v2 from './v2';
+import * as v1 from "./v1";
+import * as v2 from "./v2";
 const getNumTests = (m: object): number => {
-  return Object.keys(m).filter((k) =>
-    ({}.hasOwnProperty.call(m[k], '__endpoint'))
-  ).length;
+  return Object.keys(m).filter((k) => ({}.hasOwnProperty.call(m[k], "__endpoint"))).length;
 };
 const numTests = getNumTests(v1) + getNumTests(v2);
 export { v1, v2 };
 
-import { REGION } from './region';
-import * as testLab from './v1/testLab-utils';
+import { REGION } from "./region";
+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 client = await new GoogleAuth().getIdTokenClient(
-    '32555940559.apps.googleusercontent.com'
-  );
+  const client = await new GoogleAuth().getIdTokenClient("32555940559.apps.googleusercontent.com");
   const resp = await client.request({
     url,
-    method: 'POST',
+    method: "POST",
     headers: {
-      'Content-Type': 'application/json',
+      "Content-Type": "application/json",
     },
     body: JSON.stringify({ data }),
   });
@@ -40,11 +38,9 @@ async function callHttpsTrigger(name: string, data: any) {
   }
 }
 
-async function callV2HttpsTrigger(
-  name: string,
-  data: any,
-  accessToken: string
-) {
+// 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}`,
     {
@@ -62,14 +58,12 @@ async function callV2HttpsTrigger(
     throw new Error(`Cannot call v2 https trigger ${name} - no uri found`);
   }
 
-  const client = await new GoogleAuth().getIdTokenClient(
-    '32555940559.apps.googleusercontent.com'
-  );
+  const client = await new GoogleAuth().getIdTokenClient("32555940559.apps.googleusercontent.com");
   const invokeFnREsp = await client.request({
     url: uri,
-    method: 'POST',
+    method: "POST",
     headers: {
-      'Content-Type': 'application/json',
+      "Content-Type": "application/json",
     },
     body: JSON.stringify({ data }),
   });
@@ -78,17 +72,13 @@ async function callV2HttpsTrigger(
   }
 }
 
-async function callScheduleTrigger(
-  functionName: string,
-  region: string,
-  accessToken: string
-) {
+async function callScheduleTrigger(functionName: string, region: string, accessToken: string) {
   const response = await fetch(
     `https://cloudscheduler.googleapis.com/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`,
     {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         Authorization: `Bearer ${accessToken}`,
       },
     }
@@ -101,17 +91,13 @@ async function callScheduleTrigger(
   return;
 }
 
-async function callV2ScheduleTrigger(
-  functionName: string,
-  region: string,
-  accessToken: string
-) {
+async function callV2ScheduleTrigger(functionName: string, region: string, accessToken: string) {
   const response = await fetch(
     `https://cloudscheduler.googleapis.com/v1/projects/${firebaseConfig.projectId}/locations/us-central1/jobs/firebase-schedule-${functionName}-${region}:run`,
     {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         Authorization: `Bearer ${accessToken}`,
       },
     }
@@ -120,26 +106,20 @@ async function callV2ScheduleTrigger(
     throw new Error(`Failed request with status ${response.status}!`);
   }
   const data = await response.text();
-  functions.logger.log(
-    `Successfully scheduled v2 function ${functionName}`,
-    data
-  );
+  functions.logger.log(`Successfully scheduled v2 function ${functionName}`, data);
   return;
 }
 
-async function updateRemoteConfig(
-  testId: string,
-  accessToken: string
-): Promise<void> {
+async function updateRemoteConfig(testId: string, accessToken: string): Promise<void> {
   const resp = await fetch(
     `https://firebaseremoteconfig.googleapis.com/v1/projects/${firebaseConfig.projectId}/remoteConfig`,
     {
-      method: 'PUT',
+      method: "PUT",
       headers: {
         Authorization: `Bearer ${accessToken}`,
-        'Content-Type': 'application/json; UTF-8',
-        'Accept-Encoding': 'gzip',
-        'If-Match': '*',
+        "Content-Type": "application/json; UTF-8",
+        "Accept-Encoding": "gzip",
+        "If-Match": "*",
       },
       body: JSON.stringify({ version: { description: testId } }),
     }
@@ -152,53 +132,47 @@ async function updateRemoteConfig(
 function v1Tests(testId: string, accessToken: string): Array<Promise<unknown>> {
   return [
     // A database write to trigger the Firebase Realtime Database tests.
-    admin
-      .database()
-      .ref(`dbTests/${testId}/start`)
-      .set({ '.sv': 'timestamp' }),
+    admin.database().ref(`dbTests/${testId}/start`).set({ ".sv": "timestamp" }),
     // A Pub/Sub publish to trigger the Cloud Pub/Sub tests.
-    new PubSub()
-      .topic('pubsubTests')
-      .publish(Buffer.from(JSON.stringify({ testId }))),
+    new PubSub().topic("pubsubTests").publish(Buffer.from(JSON.stringify({ testId }))),
     // A user creation to trigger the Firebase Auth user creation tests.
     admin
       .auth()
       .createUser({
         email: `${testId}@fake.com`,
-        password: 'secret',
+        password: "secret",
         displayName: `${testId}`,
       })
-      .then((userRecord) => {
+      .then(async (userRecord) => {
         // A user deletion to trigger the Firebase Auth user deletion tests.
-        admin.auth().deleteUser(userRecord.uid);
+        await admin.auth().deleteUser(userRecord.uid);
       }),
     // A firestore write to trigger the Cloud Firestore tests.
-    admin
-      .firestore()
-      .collection('tests')
-      .doc(testId)
-      .set({ test: testId }),
+    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
     admin
       .storage()
       .bucket()
-      .upload('/tmp/' + testId + '.txt'),
+      .upload("/tmp/" + testId + ".txt"),
     testLab.startTestRun(firebaseConfig.projectId, testId, accessToken),
     // Invoke the schedule for our scheduled function to fire
-    callScheduleTrigger('v1-schedule', 'us-central1', accessToken),
+    callScheduleTrigger("v1-schedule", "us-central1", accessToken),
   ];
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function v2Tests(testId: string, accessToken: string): Array<Promise<void>> {
   return [
     // Invoke a callable HTTPS trigger.
-    callV2HttpsTrigger('v2-callabletests', { foo: 'bar', testId }, accessToken),
+    // 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),
+    callV2ScheduleTrigger("v2-schedule", "us-central1", accessToken),
   ];
 }
 
@@ -206,49 +180,35 @@ export const integrationTests: any = functions
   .region(REGION)
   .runWith({
     timeoutSeconds: 540,
-    invoker: 'private',
+    invoker: "private",
   })
   .https.onRequest(async (req: Request, resp: Response) => {
-    const testId = admin
-      .database()
-      .ref()
-      .push().key;
-    admin
-      .database()
-      .ref(`testRuns/${testId}/timestamp`)
-      .set(Date.now());
+    const testId = admin.database().ref().push().key;
+    await admin.database().ref(`testRuns/${testId}/timestamp`).set(Date.now());
     const testIdRef = admin.database().ref(`testRuns/${testId}`);
-    functions.logger.info('testId is: ', testId);
-    fs.writeFile('/tmp/' + testId + '.txt', 'test', () => {});
+    functions.logger.info("testId is: ", testId);
+    fs.writeFile(`/tmp/${testId}.txt`, "test", () => undefined);
     try {
-      const accessToken = await admin.credential
-        .applicationDefault()
-        .getAccessToken();
+      const accessToken = await admin.credential.applicationDefault().getAccessToken();
       await Promise.all([
         ...v1Tests(testId, accessToken.access_token),
         ...v2Tests(testId, accessToken.access_token),
       ]);
       // On test completion, check that all tests pass and reply "PASS", or provide further details.
-      functions.logger.info('Waiting for all tests to report they pass...');
+      functions.logger.info("Waiting for all tests to report they pass...");
       await new Promise<void>((resolve, reject) => {
-        setTimeout(() => reject(new Error('Timeout')), 5 * 60 * 1000);
+        setTimeout(() => reject(new Error("Timeout")), 5 * 60 * 1000);
         let testsExecuted = 0;
-        testIdRef.on('child_added', (snapshot) => {
-          if (snapshot.key === 'timestamp') {
+        testIdRef.on("child_added", (snapshot) => {
+          if (snapshot.key === "timestamp") {
             return;
           }
           testsExecuted += 1;
           if (!snapshot.val().passed) {
-            reject(
-              new Error(
-                `test ${snapshot.key} failed; see database for details.`
-              )
-            );
+            reject(new Error(`test ${snapshot.key} failed; see database for details.`));
             return;
           }
-          functions.logger.info(
-            `${snapshot.key} passed (${testsExecuted} of ${numTests})`
-          );
+          functions.logger.info(`${snapshot.key} passed (${testsExecuted} of ${numTests})`);
           if (testsExecuted < numTests) {
             // Not all tests have completed. Wait longer.
             return;
@@ -257,17 +217,14 @@ export const integrationTests: any = functions
           resolve();
         });
       });
-      functions.logger.info('All tests pass!');
-      resp.status(200).send('PASS \n');
+      functions.logger.info("All tests pass!");
+      resp.status(200).send("PASS \n");
     } catch (err) {
       functions.logger.info(`Some tests failed: ${err}`, err);
       resp
         .status(500)
-        .send(
-          `FAIL - details at ${functions.firebaseConfig()
-            .databaseURL!}/testRuns/${testId}`
-        );
+        .send(`FAIL - details at ${functions.firebaseConfig().databaseURL}/testRuns/${testId}`);
     } finally {
-      testIdRef.off('child_added');
+      testIdRef.off("child_added");
     }
   });
diff --git a/integration_test/functions/src/region.ts b/integration_test/functions/src/region.ts
index 4252a4672..4ce175234 100644
--- a/integration_test/functions/src/region.ts
+++ b/integration_test/functions/src/region.ts
@@ -1,2 +1,2 @@
 // TODO: Add back support for selecting region for integration test once params is ready.
-export const REGION = 'us-central1';
+export const REGION = "us-central1";
diff --git a/integration_test/functions/src/testing.ts b/integration_test/functions/src/testing.ts
index 1054c7f01..156e94242 100644
--- a/integration_test/functions/src/testing.ts
+++ b/integration_test/functions/src/testing.ts
@@ -1,5 +1,5 @@
-import * as firebase from 'firebase-admin';
-import * as functions from 'firebase-functions';
+import * as firebase from "firebase-admin";
+import * as functions from "firebase-functions";
 
 export type TestCase<T> = (data: T, context?: functions.EventContext) => any;
 export interface TestCaseMap<T> {
@@ -31,7 +31,7 @@ export class TestSuite<T> {
         .then(
           (result) => {
             functions.logger.info(
-              `${result ? 'Passed' : 'Failed with successful op'}: ${testName}`
+              `${result ? "Passed" : "Failed with successful op"}: ${testName}`
             );
             return { name: testName, passed: !!result };
           },
@@ -44,15 +44,13 @@ export class TestSuite<T> {
     }
     return Promise.all(running).then((results) => {
       let sum = 0;
+      // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
       results.forEach((val) => (sum = sum + val.passed));
       const summary = `passed ${sum} of ${running.length}`;
       const passed = sum === running.length;
       functions.logger.info(summary);
       const result = { passed, summary, tests: results };
-      return firebase
-        .database()
-        .ref(`testRuns/${testId}/${this.name}`)
-        .set(result);
+      return firebase.database().ref(`testRuns/${testId}/${this.name}`).set(result);
     });
   }
 }
@@ -74,8 +72,8 @@ export function evaluate(value: boolean, errMsg: string) {
 
 export function expectEq(left: any, right: any) {
   return evaluate(
-    left == right,
-    JSON.stringify(left) + ' does not equal ' + JSON.stringify(right)
+    left === right,
+    JSON.stringify(left) + " does not equal " + JSON.stringify(right)
   );
 }
 
@@ -88,16 +86,18 @@ function deepEq(left: any, right: any) {
     return false;
   }
 
-  if (Object.keys(left).length != Object.keys(right).length) {
+  if (Object.keys(left).length !== Object.keys(right).length) {
     return false;
   }
 
   for (const key in left) {
-    if (!right.hasOwnProperty(key)) {
-      return false;
-    }
-    if (!deepEq(left[key], right[key])) {
-      return false;
+    if (Object.prototype.hasOwnProperty.call(left, key)) {
+      if (!Object.prototype.hasOwnProperty.call(right, key)) {
+        return false;
+      }
+      if (!deepEq(left[key], right[key])) {
+        return false;
+      }
     }
   }
 
@@ -114,7 +114,7 @@ export function expectDeepEq(left: any, right: any) {
 export function expectMatches(input: string, regexp: RegExp) {
   return evaluate(
     input.match(regexp) !== null,
-    "Input '" + input + "' did not match regexp '" + regexp + "'"
+    `Input '${input}' did not match regexp '${regexp}'`
   );
 }
 
@@ -128,7 +128,7 @@ export function expectReject<EventType>(f: (e: EventType) => Promise<void>) {
     }
 
     if (!rejected) {
-      throw new Error('Test should have returned a rejected promise');
+      throw new Error("Test should have returned a rejected promise");
     }
   };
 }
diff --git a/integration_test/functions/src/v1/auth-tests.ts b/integration_test/functions/src/v1/auth-tests.ts
index e6daf5162..5d1b6188a 100644
--- a/integration_test/functions/src/v1/auth-tests.ts
+++ b/integration_test/functions/src/v1/auth-tests.ts
@@ -1,7 +1,7 @@
-import * as admin from 'firebase-admin';
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, TestSuite } from '../testing';
+import * as admin from "firebase-admin";
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, TestSuite } from "../testing";
 import UserMetadata = admin.auth.UserRecord;
 
 export const createUserTests: any = functions
@@ -11,35 +11,26 @@ export const createUserTests: any = functions
     const testId: string = u.displayName;
     functions.logger.info(`testId is ${testId}`);
 
-    return new TestSuite<UserMetadata>('auth user onCreate')
-      .it('should have a project as resource', (user, context) =>
-        expectEq(
-          context.resource.name,
-          `projects/${process.env.GCLOUD_PROJECT}`
-        )
+    return new TestSuite<UserMetadata>("auth user onCreate")
+      .it("should have a project as resource", (user, context) =>
+        expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)
       )
 
-      .it('should not have a path', (user, context) =>
-        expectEq((context as any).path, undefined)
-      )
+      .it("should not have a path", (user, context) => expectEq((context as any).path, undefined))
 
-      .it('should have the correct eventType', (user, context) =>
-        expectEq(context.eventType, 'google.firebase.auth.user.create')
+      .it("should have the correct eventType", (user, context) =>
+        expectEq(context.eventType, "google.firebase.auth.user.create")
       )
 
-      .it('should have an eventId', (user, context) => context.eventId)
+      .it("should have an eventId", (user, context) => context.eventId)
 
-      .it('should have a timestamp', (user, context) => context.timestamp)
+      .it("should have a timestamp", (user, context) => context.timestamp)
 
-      .it('should not have auth', (user, context) =>
-        expectEq((context as any).auth, undefined)
-      )
+      .it("should not have auth", (user, context) => expectEq((context as any).auth, undefined))
 
-      .it('should not have action', (user, context) =>
-        expectEq((context as any).action, undefined)
-      )
+      .it("should not have action", (user, context) => expectEq((context as any).action, undefined))
 
-      .it('should have properly defined meta', (user, context) => user.metadata)
+      .it("should have properly defined meta", (user) => user.metadata)
 
       .run(testId, u, c);
   });
@@ -51,33 +42,24 @@ export const deleteUserTests: any = functions
     const testId: string = u.displayName;
     functions.logger.info(`testId is ${testId}`);
 
-    return new TestSuite<UserMetadata>('auth user onDelete')
-      .it('should have a project as resource', (user, context) =>
-        expectEq(
-          context.resource.name,
-          `projects/${process.env.GCLOUD_PROJECT}`
-        )
+    return new TestSuite<UserMetadata>("auth user onDelete")
+      .it("should have a project as resource", (user, context) =>
+        expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)
       )
 
-      .it('should not have a path', (user, context) =>
-        expectEq((context as any).path, undefined)
-      )
+      .it("should not have a path", (user, context) => expectEq((context as any).path, undefined))
 
-      .it('should have the correct eventType', (user, context) =>
-        expectEq(context.eventType, 'google.firebase.auth.user.delete')
+      .it("should have the correct eventType", (user, context) =>
+        expectEq(context.eventType, "google.firebase.auth.user.delete")
       )
 
-      .it('should have an eventId', (user, context) => context.eventId)
+      .it("should have an eventId", (user, context) => context.eventId)
 
-      .it('should have a timestamp', (user, context) => context.timestamp)
+      .it("should have a timestamp", (user, context) => context.timestamp)
 
-      .it('should not have auth', (user, context) =>
-        expectEq((context as any).auth, undefined)
-      )
+      .it("should not have auth", (user, context) => expectEq((context as any).auth, undefined))
 
-      .it('should not have action', (user, context) =>
-        expectEq((context as any).action, undefined)
-      )
+      .it("should not have action", (user, context) => expectEq((context as any).action, undefined))
 
       .run(testId, u, c);
   });
diff --git a/integration_test/functions/src/v1/database-tests.ts b/integration_test/functions/src/v1/database-tests.ts
index fe3e29f17..df9d3cdd2 100644
--- a/integration_test/functions/src/v1/database-tests.ts
+++ b/integration_test/functions/src/v1/database-tests.ts
@@ -1,39 +1,34 @@
-import * as admin from 'firebase-admin';
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, expectMatches, TestSuite } from '../testing';
+import * as admin from "firebase-admin";
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, expectMatches, TestSuite } from "../testing";
 import DataSnapshot = admin.database.DataSnapshot;
 
-const testIdFieldName = 'testId';
+const testIdFieldName = "testId";
 
 export const databaseTests: any = functions
   .region(REGION)
-  .database.ref('dbTests/{testId}/start')
+  .database.ref("dbTests/{testId}/start")
   .onWrite((ch, ctx) => {
     if (ch.after.val() === null) {
       functions.logger.info(
-        'Event for ' +
-          ctx.params[testIdFieldName] +
-          ' is null; presuming data cleanup, so skipping.'
+        `Event for ${ctx.params[testIdFieldName]} is null; presuming data cleanup, so skipping.`
       );
       return;
     }
 
-    return new TestSuite<functions.Change<DataSnapshot>>('database ref onWrite')
+    return new TestSuite<functions.Change<DataSnapshot>>("database ref onWrite")
 
-      .it(
-        'should not have event.app',
-        (change, context) => !(context as any).app
-      )
+      .it("should not have event.app", (change, context) => !(context as any).app)
 
-      .it('should give refs access to admin data', (change) =>
+      .it("should give refs access to admin data", (change) =>
         change.after.ref.parent
-          .child('adminOnly')
+          .child("adminOnly")
           .update({ allowed: 1 })
           .then(() => true)
       )
 
-      .it('should have a correct ref url', (change) => {
+      .it("should have a correct ref url", (change) => {
         const url = change.after.ref.toString();
         return Promise.resolve()
           .then(() => {
@@ -49,7 +44,7 @@ export const databaseTests: any = functions
           });
       })
 
-      .it('should have refs resources', (change, context) =>
+      .it("should have refs resources", (change, context) =>
         expectMatches(
           context.resource.name,
           new RegExp(
@@ -58,25 +53,23 @@ export const databaseTests: any = functions
         )
       )
 
-      .it('should not include path', (change, context) =>
+      .it("should not include path", (change, context) =>
         expectEq((context as any).path, undefined)
       )
 
-      .it('should have the right eventType', (change, context) =>
-        expectEq(context.eventType, 'google.firebase.database.ref.write')
+      .it("should have the right eventType", (change, context) =>
+        expectEq(context.eventType, "google.firebase.database.ref.write")
       )
 
-      .it('should have eventId', (change, context) => context.eventId)
+      .it("should have eventId", (change, context) => context.eventId)
 
-      .it('should have timestamp', (change, context) => context.timestamp)
+      .it("should have timestamp", (change, context) => context.timestamp)
 
-      .it('should not have action', (change, context) =>
+      .it("should not have action", (change, context) =>
         expectEq((context as any).action, undefined)
       )
 
-      .it('should have admin authType', (change, context) =>
-        expectEq(context.authType, 'ADMIN')
-      )
+      .it("should have admin authType", (change, context) => expectEq(context.authType, "ADMIN"))
 
       .run(ctx.params[testIdFieldName], ch, ctx);
   });
diff --git a/integration_test/functions/src/v1/firestore-tests.ts b/integration_test/functions/src/v1/firestore-tests.ts
index 51a93d021..b986ca06a 100644
--- a/integration_test/functions/src/v1/firestore-tests.ts
+++ b/integration_test/functions/src/v1/firestore-tests.ts
@@ -1,42 +1,42 @@
-import * as admin from 'firebase-admin';
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectDeepEq, expectEq, TestSuite } from '../testing';
+import * as admin from "firebase-admin";
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectDeepEq, expectEq, TestSuite } from "../testing";
 import DocumentSnapshot = admin.firestore.DocumentSnapshot;
 
-const testIdFieldName = 'documentId';
+const testIdFieldName = "documentId";
 
 export const firestoreTests: any = functions
   .runWith({
     timeoutSeconds: 540,
   })
   .region(REGION)
-  .firestore.document('tests/{documentId}')
+  .firestore.document("tests/{documentId}")
   .onCreate((s, c) => {
-    return new TestSuite<DocumentSnapshot>('firestore document onWrite')
+    return new TestSuite<DocumentSnapshot>("firestore document onWrite")
 
-      .it('should not have event.app', (snap, context) => !(context as any).app)
+      .it("should not have event.app", (snap, context) => !(context as any).app)
 
-      .it('should give refs write access', (snap) =>
+      .it("should give refs write access", (snap) =>
         snap.ref.set({ allowed: 1 }, { merge: true }).then(() => true)
       )
 
-      .it('should have well-formatted resource', (snap, context) =>
+      .it("should have well-formatted resource", (snap, context) =>
         expectEq(
           context.resource.name,
           `projects/${process.env.GCLOUD_PROJECT}/databases/(default)/documents/tests/${context.params.documentId}`
         )
       )
 
-      .it('should have the right eventType', (snap, context) =>
-        expectEq(context.eventType, 'google.firestore.document.create')
+      .it("should have the right eventType", (snap, context) =>
+        expectEq(context.eventType, "google.firestore.document.create")
       )
 
-      .it('should have eventId', (snap, context) => context.eventId)
+      .it("should have eventId", (snap, context) => context.eventId)
 
-      .it('should have timestamp', (snap, context) => context.timestamp)
+      .it("should have timestamp", (snap, context) => context.timestamp)
 
-      .it('should have the correct data', (snap, context) =>
+      .it("should have the correct data", (snap, context) =>
         expectDeepEq(snap.data(), { test: context.params.documentId })
       )
 
diff --git a/integration_test/functions/src/v1/https-tests.ts b/integration_test/functions/src/v1/https-tests.ts
index bce05f341..5a74a1903 100644
--- a/integration_test/functions/src/v1/https-tests.ts
+++ b/integration_test/functions/src/v1/https-tests.ts
@@ -1,14 +1,12 @@
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, TestSuite } from '../testing';
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, TestSuite } from "../testing";
 
 export const callableTests: any = functions
-  .runWith({ invoker: 'private' })
+  .runWith({ invoker: "private" })
   .region(REGION)
   .https.onCall((d) => {
-    return new TestSuite('https onCall')
-      .it('should have the correct data', (data: any) =>
-        expectEq(data?.foo, 'bar')
-      )
+    return new TestSuite("https onCall")
+      .it("should have the correct data", (data: any) => expectEq(data?.foo, "bar"))
       .run(d.testId, d);
   });
diff --git a/integration_test/functions/src/v1/index.ts b/integration_test/functions/src/v1/index.ts
index 6e6717b15..0a1a2a35f 100644
--- a/integration_test/functions/src/v1/index.ts
+++ b/integration_test/functions/src/v1/index.ts
@@ -1,8 +1,9 @@
-export * from './pubsub-tests';
-export * from './database-tests';
-export * from './auth-tests';
-export * from './firestore-tests';
-export * from './https-tests';
-export * from './remoteConfig-tests';
-export * from './storage-tests';
-export * from './testLab-tests';
+export * from "./pubsub-tests";
+export * from "./database-tests";
+export * from "./auth-tests";
+export * from "./firestore-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";
diff --git a/integration_test/functions/src/v1/pubsub-tests.ts b/integration_test/functions/src/v1/pubsub-tests.ts
index 515708e07..152ad7b6a 100644
--- a/integration_test/functions/src/v1/pubsub-tests.ts
+++ b/integration_test/functions/src/v1/pubsub-tests.ts
@@ -1,14 +1,14 @@
-import * as admin from 'firebase-admin';
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { evaluate, expectEq, success, TestSuite } from '../testing';
+import * as admin from "firebase-admin";
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { evaluate, expectEq, success, TestSuite } from "../testing";
 import PubsubMessage = functions.pubsub.Message;
 
 // TODO(inlined) use multiple queues to run inline.
 // Expected message data: {"hello": "world"}
 export const pubsubTests: any = functions
   .region(REGION)
-  .pubsub.topic('pubsubTests')
+  .pubsub.topic("pubsubTests")
   .onPublish((m, c) => {
     let testId: string;
     try {
@@ -17,45 +17,37 @@ export const pubsubTests: any = functions
       /* Ignored. Covered in another test case that `event.data.json` works. */
     }
 
-    return new TestSuite<PubsubMessage>('pubsub onPublish')
-      .it('should have a topic as resource', (message, context) =>
-        expectEq(
-          context.resource.name,
-          `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests`
-        )
+    return new TestSuite<PubsubMessage>("pubsub onPublish")
+      .it("should have a topic as resource", (message, context) =>
+        expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}/topics/pubsubTests`)
       )
 
-      .it('should not have a path', (message, context) =>
+      .it("should not have a path", (message, context) =>
         expectEq((context as any).path, undefined)
       )
 
-      .it('should have the correct eventType', (message, context) =>
-        expectEq(context.eventType, 'google.pubsub.topic.publish')
+      .it("should have the correct eventType", (message, context) =>
+        expectEq(context.eventType, "google.pubsub.topic.publish")
       )
 
-      .it('should have an eventId', (message, context) => context.eventId)
+      .it("should have an eventId", (message, context) => context.eventId)
 
-      .it('should have a timestamp', (message, context) => context.timestamp)
+      .it("should have a timestamp", (message, context) => context.timestamp)
 
-      .it('should not have auth', (message, context) =>
-        expectEq((context as any).auth, undefined)
-      )
+      .it("should not have auth", (message, context) => expectEq((context as any).auth, undefined))
 
-      .it('should not have action', (message, context) =>
+      .it("should not have action", (message, context) =>
         expectEq((context as any).action, undefined)
       )
 
-      .it('should have pubsub data', (message) => {
-        const decoded = new Buffer(message.data, 'base64').toString();
+      .it("should have pubsub data", (message) => {
+        const decoded = new Buffer(message.data, "base64").toString();
         const parsed = JSON.parse(decoded);
-        return evaluate(
-          parsed.hasOwnProperty('testId'),
-          'Raw data was: ' + message.data
-        );
+        return evaluate(parsed.hasOwnProperty("testId"), `Raw data was + ${message.data}`);
       })
 
-      .it('should decode JSON payloads with the json helper', (message) =>
-        evaluate(message.json.hasOwnProperty('testId'), message.json)
+      .it("should decode JSON payloads with the json helper", (message) =>
+        evaluate(message.json.hasOwnProperty("testId"), message.json)
       )
 
       .run(testId, m, c);
@@ -63,17 +55,13 @@ export const pubsubTests: any = functions
 
 export const schedule: any = functions
   .region(REGION)
-  .pubsub.schedule('every 10 hours') // This is a dummy schedule, since we need to put a valid one in.
+  .pubsub.schedule("every 10 hours") // This is a dummy schedule, since we need to put a valid one in.
   // For the test, the job is triggered by the jobs:run api
-  .onRun(async (context) => {
+  .onRun(async () => {
     const db = admin.database();
-    const snap = await db
-      .ref('testRuns')
-      .orderByChild('timestamp')
-      .limitToLast(1)
-      .once('value');
+    const snap = await db.ref("testRuns").orderByChild("timestamp").limitToLast(1).once("value");
     const testId = Object.keys(snap.val())[0];
-    return new TestSuite('pubsub scheduleOnRun')
-      .it('should trigger when the scheduler fires', () => success())
+    return new TestSuite("pubsub scheduleOnRun")
+      .it("should trigger when the scheduler fires", () => success())
       .run(testId, null);
   });
diff --git a/integration_test/functions/src/v1/remoteConfig-tests.ts b/integration_test/functions/src/v1/remoteConfig-tests.ts
index 47e70461b..416621774 100644
--- a/integration_test/functions/src/v1/remoteConfig-tests.ts
+++ b/integration_test/functions/src/v1/remoteConfig-tests.ts
@@ -1,30 +1,23 @@
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, TestSuite } from '../testing';
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, TestSuite } from "../testing";
 import TemplateVersion = functions.remoteConfig.TemplateVersion;
 
-export const remoteConfigTests: any = functions
-  .region(REGION)
-  .remoteConfig.onUpdate((v, c) => {
-    return new TestSuite<TemplateVersion>('remoteConfig onUpdate')
-      .it('should have a project as resource', (version, context) =>
-        expectEq(
-          context.resource.name,
-          `projects/${process.env.GCLOUD_PROJECT}`
-        )
-      )
+export const remoteConfigTests: any = functions.region(REGION).remoteConfig.onUpdate((v, c) => {
+  return new TestSuite<TemplateVersion>("remoteConfig onUpdate")
+    .it("should have a project as resource", (version, context) =>
+      expectEq(context.resource.name, `projects/${process.env.GCLOUD_PROJECT}`)
+    )
 
-      .it('should have the correct eventType', (version, context) =>
-        expectEq(context.eventType, 'google.firebase.remoteconfig.update')
-      )
+    .it("should have the correct eventType", (version, context) =>
+      expectEq(context.eventType, "google.firebase.remoteconfig.update")
+    )
 
-      .it('should have an eventId', (version, context) => context.eventId)
+    .it("should have an eventId", (version, context) => context.eventId)
 
-      .it('should have a timestamp', (version, context) => context.timestamp)
+    .it("should have a timestamp", (version, context) => context.timestamp)
 
-      .it('should not have auth', (version, context) =>
-        expectEq((context as any).auth, undefined)
-      )
+    .it("should not have auth", (version, context) => expectEq((context as any).auth, undefined))
 
-      .run(v.description, v, c);
-  });
+    .run(v.description, v, c);
+});
diff --git a/integration_test/functions/src/v1/storage-tests.ts b/integration_test/functions/src/v1/storage-tests.ts
index 51b947293..6819c7a2a 100644
--- a/integration_test/functions/src/v1/storage-tests.ts
+++ b/integration_test/functions/src/v1/storage-tests.ts
@@ -1,6 +1,6 @@
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, TestSuite } from '../testing';
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, TestSuite } from "../testing";
 import ObjectMetadata = functions.storage.ObjectMetadata;
 
 export const storageTests: any = functions
@@ -11,18 +11,18 @@ export const storageTests: any = functions
   .storage.bucket()
   .object()
   .onFinalize((s, c) => {
-    const testId = s.name.split('.')[0];
-    return new TestSuite<ObjectMetadata>('storage object finalize')
+    const testId = s.name.split(".")[0];
+    return new TestSuite<ObjectMetadata>("storage object finalize")
 
-      .it('should not have event.app', (data, context) => !(context as any).app)
+      .it("should not have event.app", (data, context) => !(context as any).app)
 
-      .it('should have the right eventType', (snap, context) =>
-        expectEq(context.eventType, 'google.storage.object.finalize')
+      .it("should have the right eventType", (snap, context) =>
+        expectEq(context.eventType, "google.storage.object.finalize")
       )
 
-      .it('should have eventId', (snap, context) => context.eventId)
+      .it("should have eventId", (snap, context) => context.eventId)
 
-      .it('should have timestamp', (snap, context) => context.timestamp)
+      .it("should have timestamp", (snap, context) => context.timestamp)
 
       .run(testId, s, c);
   });
diff --git a/integration_test/functions/src/v1/testLab-tests.ts b/integration_test/functions/src/v1/testLab-tests.ts
index 8e1986ce0..242cd21f6 100644
--- a/integration_test/functions/src/v1/testLab-tests.ts
+++ b/integration_test/functions/src/v1/testLab-tests.ts
@@ -1,6 +1,6 @@
-import * as functions from 'firebase-functions';
-import { REGION } from '../region';
-import { expectEq, TestSuite } from '../testing';
+import * as functions from "firebase-functions";
+import { REGION } from "../region";
+import { expectEq, TestSuite } from "../testing";
 import TestMatrix = functions.testLab.TestMatrix;
 
 export const testLabTests: any = functions
@@ -10,16 +10,14 @@ export const testLabTests: any = functions
   .region(REGION)
   .testLab.testMatrix()
   .onComplete((matrix, context) => {
-    return new TestSuite<TestMatrix>('test matrix complete')
-      .it('should have eventId', (snap, context) => context.eventId)
+    return new TestSuite<TestMatrix>("test matrix complete")
+      .it("should have eventId", (snap, context) => context.eventId)
 
-      .it('should have right eventType', (_, context) =>
-        expectEq(context.eventType, 'google.testing.testMatrix.complete')
+      .it("should have right eventType", (_, context) =>
+        expectEq(context.eventType, "google.testing.testMatrix.complete")
       )
 
-      .it("should be in state 'INVALID'", (matrix, _) =>
-        expectEq(matrix.state, 'INVALID')
-      )
+      .it("should be in state 'INVALID'", (matrix) => expectEq(matrix.state, "INVALID"))
 
       .run(matrix?.clientInfo?.details?.testId, matrix, context);
   });
diff --git a/integration_test/functions/src/v1/testLab-utils.ts b/integration_test/functions/src/v1/testLab-utils.ts
index 870c9b8ec..7ba32e112 100644
--- a/integration_test/functions/src/v1/testLab-utils.ts
+++ b/integration_test/functions/src/v1/testLab-utils.ts
@@ -1,5 +1,5 @@
-import * as admin from 'firebase-admin';
-import fetch from 'node-fetch';
+import * as admin from "firebase-admin";
+import fetch from "node-fetch";
 
 interface AndroidDevice {
   androidModelId: string;
@@ -8,7 +8,7 @@ interface AndroidDevice {
   orientation: string;
 }
 
-const TESTING_API_SERVICE_NAME = 'testing.googleapis.com';
+const TESTING_API_SERVICE_NAME = "testing.googleapis.com";
 
 /**
  * Creates a new TestMatrix in Test Lab which is expected to be rejected as
@@ -18,11 +18,7 @@ const TESTING_API_SERVICE_NAME = 'testing.googleapis.com';
  * @param testId Test id which will be encoded in client info details
  * @param accessToken accessToken to attach to requested for authentication
  */
-export async function startTestRun(
-  projectId: string,
-  testId: string,
-  accessToken: string
-) {
+export async function startTestRun(projectId: string, testId: string, accessToken: string) {
   const device = await fetchDefaultDevice(accessToken);
   return await createTestMatrix(accessToken, projectId, testId, device);
 }
@@ -32,8 +28,8 @@ async function fetchDefaultDevice(accessToken: string): Promise<AndroidDevice> {
     `https://${TESTING_API_SERVICE_NAME}/v1/testEnvironmentCatalog/ANDROID`,
     {
       headers: {
-        Authorization: 'Bearer ' + accessToken,
-        'Content-Type': 'application/json',
+        Authorization: "Bearer " + accessToken,
+        "Content-Type": "application/json",
       },
     }
   );
@@ -45,13 +41,13 @@ async function fetchDefaultDevice(accessToken: string): Promise<AndroidDevice> {
   const defaultModels = models.filter(
     (m) =>
       m.tags !== undefined &&
-      m.tags.indexOf('default') > -1 &&
+      m.tags.indexOf("default") > -1 &&
       m.supportedVersionIds !== undefined &&
       m.supportedVersionIds.length > 0
   );
 
   if (defaultModels.length === 0) {
-    throw new Error('No default device found');
+    throw new Error("No default device found");
   }
 
   const model = defaultModels[0];
@@ -60,8 +56,8 @@ async function fetchDefaultDevice(accessToken: string): Promise<AndroidDevice> {
   return {
     androidModelId: model.id,
     androidVersionId: versions[versions.length - 1],
-    locale: 'en',
-    orientation: 'portrait',
+    locale: "en",
+    orientation: "portrait",
   } as AndroidDevice;
 }
 
@@ -76,7 +72,7 @@ async function createTestMatrix(
     testSpecification: {
       androidRoboTest: {
         appApk: {
-          gcsPath: 'gs://path/to/non-existing-app.apk',
+          gcsPath: "gs://path/to/non-existing-app.apk",
         },
       },
     },
@@ -87,13 +83,13 @@ async function createTestMatrix(
     },
     resultStorage: {
       googleCloudStorage: {
-        gcsPath: 'gs://' + admin.storage().bucket().name,
+        gcsPath: "gs://" + admin.storage().bucket().name,
       },
     },
     clientInfo: {
-      name: 'CloudFunctionsSDKIntegrationTest',
+      name: "CloudFunctionsSDKIntegrationTest",
       clientInfoDetails: {
-        key: 'testId',
+        key: "testId",
         value: testId,
       },
     },
@@ -101,10 +97,10 @@ async function createTestMatrix(
   const resp = await fetch(
     `https://${TESTING_API_SERVICE_NAME}/v1/projects/${projectId}/testMatrices`,
     {
-      method: 'POST',
+      method: "POST",
       headers: {
-        Authorization: 'Bearer ' + accessToken,
-        'Content-Type': 'application/json',
+        Authorization: "Bearer " + accessToken,
+        "Content-Type": "application/json",
       },
       body: JSON.stringify(body),
     }
diff --git a/integration_test/functions/src/v2/https-tests.ts b/integration_test/functions/src/v2/https-tests.ts
index 448464ef0..b787ac602 100644
--- a/integration_test/functions/src/v2/https-tests.ts
+++ b/integration_test/functions/src/v2/https-tests.ts
@@ -1,10 +1,8 @@
-import { onCall } from 'firebase-functions/v2/https';
-import { expectEq, TestSuite } from '../testing';
+import { onCall } from "firebase-functions/v2/https";
+import { expectEq, TestSuite } from "../testing";
 
-export const callabletests = onCall({ invoker: 'private' }, (req) => {
-  return new TestSuite('v2 https onCall')
-    .it('should have the correct data', (data: any) =>
-      expectEq(data?.foo, 'bar')
-    )
+export const callabletests = onCall({ invoker: "private" }, (req) => {
+  return new TestSuite("v2 https onCall")
+    .it("should have the correct data", (data: any) => expectEq(data?.foo, "bar"))
     .run(req.data.testId, req.data);
 });
diff --git a/integration_test/functions/src/v2/index.ts b/integration_test/functions/src/v2/index.ts
index 6b8f55e2a..38cde5f92 100644
--- a/integration_test/functions/src/v2/index.ts
+++ b/integration_test/functions/src/v2/index.ts
@@ -1,6 +1,7 @@
-import { setGlobalOptions } from 'firebase-functions/v2';
-import { REGION } from '../region';
+import { setGlobalOptions } from "firebase-functions/v2";
+import { REGION } from "../region";
 setGlobalOptions({ region: REGION });
 
-export * from './https-tests';
-export * from './scheduled-tests';
+// TODO: Temporarily disable - doesn't work unless running on projects w/ permission to create public functions.
+// export * from './https-tests';
+export * from "./scheduled-tests";
diff --git a/integration_test/functions/src/v2/scheduled-tests.ts b/integration_test/functions/src/v2/scheduled-tests.ts
index ffffb386c..cc13bed62 100644
--- a/integration_test/functions/src/v2/scheduled-tests.ts
+++ b/integration_test/functions/src/v2/scheduled-tests.ts
@@ -1,23 +1,19 @@
-import * as admin from 'firebase-admin';
-import { onSchedule } from 'firebase-functions/v2/scheduler';
-import { REGION } from '../region';
-import { success, TestSuite } from '../testing';
+import * as admin from "firebase-admin";
+import { onSchedule } from "firebase-functions/v2/scheduler";
+import { REGION } from "../region";
+import { success, TestSuite } from "../testing";
 
 export const schedule: any = onSchedule(
   {
-    schedule: 'every 10 hours',
+    schedule: "every 10 hours",
     region: REGION,
   },
-  async (event) => {
+  async () => {
     const db = admin.database();
-    const snap = await db
-      .ref('testRuns')
-      .orderByChild('timestamp')
-      .limitToLast(1)
-      .once('value');
+    const snap = await db.ref("testRuns").orderByChild("timestamp").limitToLast(1).once("value");
     const testId = Object.keys(snap.val())[0];
-    return new TestSuite('scheduler scheduleOnRun')
-      .it('should trigger when the scheduler fires', () => success())
+    return new TestSuite("scheduler scheduleOnRun")
+      .it("should trigger when the scheduler fires", () => success())
       .run(testId, null);
   }
 );
diff --git a/mocha/setup.ts b/mocha/setup.ts
index ba4d08621..ded201904 100644
--- a/mocha/setup.ts
+++ b/mocha/setup.ts
@@ -1,6 +1,6 @@
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import * as nock from 'nock';
+import * as chai from "chai";
+import * as chaiAsPromised from "chai-as-promised";
+import * as nock from "nock";
 
 chai.use(chaiAsPromised);
 
diff --git a/package-lock.json b/package-lock.json
index 9c9e905c8..e1e8f1215 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,6 @@
         "@types/express": "4.17.3",
         "cors": "^2.8.5",
         "express": "^4.17.1",
-        "lodash": "^4.17.14",
         "node-fetch": "^2.6.7"
       },
       "bin": {
@@ -26,17 +25,23 @@
         "@types/chai": "^4.1.7",
         "@types/chai-as-promised": "^7.1.0",
         "@types/jsonwebtoken": "^8.3.2",
-        "@types/lodash": "^4.14.135",
         "@types/mocha": "^5.2.7",
         "@types/mock-require": "^2.0.0",
         "@types/nock": "^10.0.3",
-        "@types/node": "^8.10.50",
+        "@types/node": "^14.18.24",
         "@types/node-fetch": "^3.0.3",
         "@types/sinon": "^7.0.13",
+        "@typescript-eslint/eslint-plugin": "^5.33.1",
+        "@typescript-eslint/parser": "^5.33.1",
         "api-extractor-model-me": "^0.1.1",
         "chai": "^4.2.0",
         "chai-as-promised": "^7.1.1",
         "child-process-promise": "^2.2.1",
+        "eslint": "^8.6.0",
+        "eslint-config-google": "^0.14.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-jsdoc": "^39.2.9",
+        "eslint-plugin-prettier": "^4.0.0",
         "firebase-admin": "^10.3.0",
         "js-yaml": "^3.13.1",
         "jsdom": "^16.2.1",
@@ -48,74 +53,136 @@
         "nock": "^10.0.6",
         "node-fetch": "^2.6.7",
         "portfinder": "^1.0.28",
-        "prettier": "^1.18.2",
+        "prettier": "^2.7.1",
         "semver": "^7.3.5",
         "sinon": "^7.3.2",
         "ts-node": "^10.4.0",
-        "tslint": "^5.18.0",
-        "tslint-config-prettier": "^1.18.0",
-        "tslint-no-unused-expression-chai": "^0.1.4",
-        "tslint-plugin-prettier": "^2.0.1",
-        "typedoc": "0.23.7",
         "typescript": "^4.3.5",
         "yargs": "^15.3.1"
       },
       "engines": {
-        "node": "^8.13.0 || >=10.10.0"
+        "node": ">=14.10.0"
       },
       "peerDependencies": {
-        "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
+        "firebase-admin": "^10.0.0 || ^11.0.0"
+      }
+    },
+    "node_modules/@cspotcode/source-map-consumer": {
+      "version": "0.8.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 12"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.16.7",
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.7.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.16.7"
+        "@cspotcode/source-map-consumer": "0.8.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.16.7",
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.31.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz",
+      "integrity": "sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "comment-parser": "1.3.1",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "~3.1.0"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^14 || ^16 || ^17 || ^18"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.17.9",
+    "node_modules/@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
-    "node_modules/@cspotcode/source-map-consumer": {
-      "version": "0.8.0",
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
       "engines": {
-        "node": ">= 12"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.7.0",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@cspotcode/source-map-consumer": "0.8.0"
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=12"
+        "node": "*"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@eslint/eslintrc/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@fastify/busboy": {
@@ -470,6 +537,59 @@
         "node": ">=10"
       }
     },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+      "dev": true,
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@humanwhocodes/config-array/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "node_modules/@microsoft/api-documenter": {
       "version": "7.17.11",
       "dev": true,
@@ -778,6 +898,41 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/@panva/asn1.js": {
       "version": "1.0.0",
       "dev": true,
@@ -1053,6 +1208,12 @@
       "version": "17.0.29",
       "license": "MIT"
     },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
     "node_modules/@types/jsonwebtoken": {
       "version": "8.5.8",
       "dev": true,
@@ -1061,11 +1222,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/lodash": {
-      "version": "4.14.182",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/long": {
       "version": "4.0.2",
       "dev": true,
@@ -1098,9 +1254,10 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "8.10.66",
-      "dev": true,
-      "license": "MIT"
+      "version": "14.18.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.25.tgz",
+      "integrity": "sha512-9pLfceRSrKIsv/MISN6RoFWTIzka36Uk2Uuf5a8cHyDYhEgl5Hm5dXoe621KULeBjt+cFsY18mILsWWtJeG80w==",
+      "dev": true
     },
     "node_modules/@types/node-fetch": {
       "version": "3.0.3",
@@ -1135,88 +1292,181 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
+      "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "event-target-shim": "^5.0.0"
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/type-utils": "5.33.1",
+        "@typescript-eslint/utils": "5.33.1",
+        "debug": "^4.3.4",
+        "functional-red-black-tree": "^1.0.1",
+        "ignore": "^5.2.0",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=6.5"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "license": "MIT",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/acorn": {
-      "version": "8.7.1",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "tslib": "^1.8.1"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
       }
     },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
+      "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/typescript-estree": "5.33.1",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+      "dependencies": {
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
+      "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
       "dev": true,
-      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/visitor-keys": "5.33.1"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
+      "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "debug": "4"
+        "@typescript-eslint/utils": "5.33.1",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">= 6.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/agent-base/node_modules/debug": {
+    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
       "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -1229,23 +1479,279 @@
         }
       }
     },
-    "node_modules/agent-base/node_modules/ms": {
+    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
+    "node_modules/@typescript-eslint/type-utils/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "tslib": "^1.8.1"
       },
-      "funding": {
-        "type": "github",
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
+      "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
+      "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/visitor-keys": "5.33.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/tsutils": {
+      "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.8.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      },
+      "peerDependencies": {
+        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      }
+    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
+      "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/typescript-estree": "5.33.1",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
+      "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "5.33.1",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agent-base/node_modules/debug": {
+      "version": "4.3.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/agent-base/node_modules/ms": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
@@ -1315,6 +1821,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/arrify": {
       "version": "2.0.1",
       "dev": true,
@@ -1435,6 +1950,18 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/brorand": {
       "version": "1.1.0",
       "dev": true,
@@ -1455,14 +1982,6 @@
       "dev": true,
       "license": "BSD-3-Clause"
     },
-    "node_modules/builtin-modules": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "license": "MIT",
@@ -1481,6 +2000,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/camelcase": {
       "version": "5.3.1",
       "dev": true,
@@ -1632,7 +2160,17 @@
     "node_modules/commander": {
       "version": "2.20.3",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/comment-parser": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12.0.0"
+      }
     },
     "node_modules/compressible": {
       "version": "2.0.18",
@@ -1894,6 +2432,30 @@
         "node": ">=0.3.1"
       }
     },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/domexception": {
       "version": "2.0.1",
       "dev": true,
@@ -2098,25 +2660,504 @@
         "source-map": "~0.6.1"
       }
     },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "2.7.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-diff": "^1.1.1",
-        "jest-docblock": "^21.0.0"
+    "node_modules/eslint": {
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
+      "dev": true,
+      "dependencies": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.3",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "prettier": ">= 0.11.0"
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
+    "node_modules/eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5.16.0"
+      }
+    },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "39.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz",
+      "integrity": "sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g==",
+      "dev": true,
+      "dependencies": {
+        "@es-joy/jsdoccomment": "~0.31.0",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.4.0",
+        "semver": "^7.3.7",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "engines": {
+        "node": "^14 || ^16 || ^17 || ^18"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint-plugin-jsdoc/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "dependencies": {
+        "prettier-linter-helpers": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint-config-prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/eslint/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eslint/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/eslint/node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/eslint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/espree": {
+      "version": "9.3.3",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
+      "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -2125,6 +3166,30 @@
         "node": ">=4"
       }
     },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
     "node_modules/estraverse": {
       "version": "5.3.0",
       "dev": true,
@@ -2210,8 +3275,37 @@
     },
     "node_modules/fast-diff": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
+      "dev": true
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
-      "license": "Apache-2.0"
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -2229,6 +3323,15 @@
       "license": "Apache-2.0",
       "optional": true
     },
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
     "node_modules/faye-websocket": {
       "version": "0.11.4",
       "dev": true,
@@ -2240,6 +3343,30 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.2.0",
       "license": "MIT",
@@ -2306,6 +3433,25 @@
         "flat": "cli.js"
       }
     },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "dev": true,
@@ -2358,8 +3504,7 @@
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "dev": true,
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
@@ -2457,6 +3602,53 @@
         "node": "*"
       }
     },
+    "node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/google-auth-library": {
       "version": "7.14.1",
       "dev": true,
@@ -2542,6 +3734,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "node_modules/growl": {
       "version": "1.10.5",
       "dev": true,
@@ -2768,6 +3966,31 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/import-lazy": {
       "version": "4.0.0",
       "dev": true,
@@ -2780,7 +4003,6 @@
       "version": "0.1.4",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.8.19"
       }
@@ -2917,6 +4139,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "dev": true,
@@ -2925,6 +4156,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
       "dev": true,
@@ -2936,6 +4179,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-number-object": {
       "version": "1.0.7",
       "dev": true,
@@ -3063,11 +4315,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/jest-docblock": {
-      "version": "21.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/jju": {
       "version": "1.4.0",
       "dev": true,
@@ -3087,11 +4334,6 @@
         "url": "https://github.com/sponsors/panva"
       }
     },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/js-yaml": {
       "version": "3.14.1",
       "dev": true,
@@ -3104,6 +4346,15 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
+      "integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/jsdom": {
       "version": "16.7.0",
       "dev": true,
@@ -3237,17 +4488,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz",
-      "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==",
-      "dev": true
-    },
     "node_modules/jsonfile": {
       "version": "4.0.0",
       "dev": true,
@@ -3409,11 +4660,6 @@
       "version": "1.1.5",
       "dev": true
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/locate-path": {
       "version": "3.0.0",
       "dev": true,
@@ -3428,6 +4674,7 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.camelcase": {
@@ -3481,6 +4728,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "node_modules/lodash.once": {
       "version": "4.1.1",
       "dev": true,
@@ -3543,11 +4796,6 @@
         "yallist": "^2.0.0"
       }
     },
-    "node_modules/lunr": {
-      "version": "2.3.9",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/make-dir": {
       "version": "3.1.0",
       "dev": true,
@@ -3577,18 +4825,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/marked": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz",
-      "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==",
-      "dev": true,
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "license": "MIT",
@@ -3600,6 +4836,15 @@
       "version": "1.0.1",
       "license": "MIT"
     },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/methods": {
       "version": "1.1.2",
       "license": "MIT",
@@ -3607,6 +4852,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime": {
       "version": "1.6.0",
       "license": "MIT",
@@ -3887,6 +5145,12 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
     "node_modules/negotiator": {
       "version": "0.6.3",
       "license": "MIT",
@@ -4152,7 +5416,6 @@
       "version": "3.1.0",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -4196,6 +5459,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/parse5": {
       "version": "6.0.1",
       "dev": true,
@@ -4224,6 +5499,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "dev": true,
@@ -4233,6 +5517,15 @@
       "version": "0.1.7",
       "license": "MIT"
     },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/pathval": {
       "version": "1.1.1",
       "dev": true,
@@ -4241,6 +5534,18 @@
         "node": "*"
       }
     },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.28",
       "dev": true,
@@ -4286,14 +5591,30 @@
       }
     },
     "node_modules/prettier": {
-      "version": "1.19.1",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/promise-polyfill": {
@@ -4413,6 +5734,26 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
     "node_modules/range-parser": {
       "version": "1.2.1",
       "license": "MIT",
@@ -4463,6 +5804,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
     "node_modules/remove-trailing-separator": {
       "version": "1.1.0",
       "dev": true,
@@ -4497,6 +5850,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/retry": {
       "version": "0.13.1",
       "dev": true,
@@ -4542,6 +5904,54 @@
       "license": "MIT",
       "optional": true
     },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true,
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "funding": [
@@ -4653,15 +6063,25 @@
       "version": "1.2.0",
       "license": "ISC"
     },
-    "node_modules/shiki": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz",
-      "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==",
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "dependencies": {
-        "jsonc-parser": "^3.0.0",
-        "vscode-oniguruma": "^1.6.1",
-        "vscode-textmate": "5.2.0"
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/side-channel": {
@@ -4707,6 +6127,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "dev": true,
@@ -4715,6 +6144,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "dev": true,
@@ -4869,6 +6320,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "dev": true,
@@ -4893,6 +6350,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "license": "MIT",
@@ -4981,138 +6450,6 @@
       "dev": true,
       "license": "0BSD"
     },
-    "node_modules/tslint": {
-      "version": "5.20.1",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.29.0"
-      },
-      "bin": {
-        "tslint": "bin/tslint"
-      },
-      "engines": {
-        "node": ">=4.8.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev"
-      }
-    },
-    "node_modules/tslint-config-prettier": {
-      "version": "1.18.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "tslint-config-prettier-check": "bin/check.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/tslint-no-unused-expression-chai": {
-      "version": "0.1.4",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tsutils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "tslint": ">=5.1.0"
-      }
-    },
-    "node_modules/tslint-no-unused-expression-chai/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "node_modules/tslint-no-unused-expression-chai/node_modules/tsutils": {
-      "version": "3.21.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tslint-plugin-prettier": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-plugin-prettier": "^2.2.0",
-        "lines-and-columns": "^1.1.6",
-        "tslib": "^1.7.1"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "peerDependencies": {
-        "prettier": "^1.9.0 || ^2.0.0",
-        "tslint": "^5.0.0 || ^6.0.0"
-      }
-    },
-    "node_modules/tslint-plugin-prettier/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "node_modules/tslint/node_modules/diff": {
-      "version": "4.0.2",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/tslint/node_modules/semver": {
-      "version": "5.7.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/tslint/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
-    "node_modules/tsutils": {
-      "version": "2.29.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
-    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "dev": true,
@@ -5132,66 +6469,36 @@
         "node": ">=4"
       }
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "license": "MIT",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/typedoc": {
-      "version": "0.23.7",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.7.tgz",
-      "integrity": "sha512-Vl/Yh4KYBaxQQOYImBgLQDX61hfaA7XaP/DZVd/w7rQvaqLEsdQH6gEMK8CMjyHo0bSzVnNYwxtD1KPSENoWug==",
+    "node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "dependencies": {
-        "lunr": "^2.3.9",
-        "marked": "^4.0.16",
-        "minimatch": "^5.1.0",
-        "shiki": "^0.10.1"
-      },
-      "bin": {
-        "typedoc": "bin/typedoc"
-      },
       "engines": {
-        "node": ">= 14.14"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "typescript": "4.6.x || 4.7.x"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/typedoc/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/typedoc/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
       "dev": true,
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
+        "is-typedarray": "^1.0.0"
       }
     },
     "node_modules/typescript": {
@@ -5276,6 +6583,12 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
       "dev": true,
@@ -5296,18 +6609,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/vscode-oniguruma": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz",
-      "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==",
-      "dev": true
-    },
-    "node_modules/vscode-textmate": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz",
-      "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==",
-      "dev": true
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -5822,7 +7123,6 @@
       "version": "0.1.0",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=10"
       },
@@ -5848,35 +7148,90 @@
     }
   },
   "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.16.7",
+    "@cspotcode/source-map-consumer": {
+      "version": "0.8.0",
+      "dev": true
+    },
+    "@cspotcode/source-map-support": {
+      "version": "0.7.0",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.16.7"
+        "@cspotcode/source-map-consumer": "0.8.0"
       }
     },
-    "@babel/helper-validator-identifier": {
-      "version": "7.16.7",
-      "dev": true
-    },
-    "@babel/highlight": {
-      "version": "7.17.9",
+    "@es-joy/jsdoccomment": {
+      "version": "0.31.0",
+      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz",
+      "integrity": "sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
+        "comment-parser": "1.3.1",
+        "esquery": "^1.4.0",
+        "jsdoc-type-pratt-parser": "~3.1.0"
       }
     },
-    "@cspotcode/source-map-consumer": {
-      "version": "0.8.0",
-      "dev": true
-    },
-    "@cspotcode/source-map-support": {
-      "version": "0.7.0",
+    "@eslint/eslintrc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
+      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
       "dev": true,
       "requires": {
-        "@cspotcode/source-map-consumer": "0.8.0"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.3.2",
+        "globals": "^13.15.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        }
       }
     },
     "@fastify/busboy": {
@@ -6157,6 +7512,46 @@
         }
       }
     },
+    "@humanwhocodes/config-array": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+      "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+      "dev": true,
+      "requires": {
+        "@humanwhocodes/object-schema": "^1.2.1",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "@humanwhocodes/gitignore-to-minimatch": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+      "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+      "dev": true
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
     "@microsoft/api-documenter": {
       "version": "7.17.11",
       "dev": true,
@@ -6391,6 +7786,32 @@
         }
       }
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      }
+    },
     "@panva/asn1.js": {
       "version": "1.0.0",
       "dev": true
@@ -6621,6 +8042,12 @@
         }
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "dev": true
+    },
     "@types/jsonwebtoken": {
       "version": "8.5.8",
       "dev": true,
@@ -6628,10 +8055,6 @@
         "@types/node": "*"
       }
     },
-    "@types/lodash": {
-      "version": "4.14.182",
-      "dev": true
-    },
     "@types/long": {
       "version": "4.0.2",
       "dev": true,
@@ -6651,46 +8074,256 @@
         "@types/node": "*"
       }
     },
-    "@types/nock": {
-      "version": "10.0.3",
+    "@types/nock": {
+      "version": "10.0.3",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "14.18.25",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.25.tgz",
+      "integrity": "sha512-9pLfceRSrKIsv/MISN6RoFWTIzka36Uk2Uuf5a8cHyDYhEgl5Hm5dXoe621KULeBjt+cFsY18mILsWWtJeG80w==",
+      "dev": true
+    },
+    "@types/node-fetch": {
+      "version": "3.0.3",
+      "dev": true,
+      "requires": {
+        "node-fetch": "*"
+      }
+    },
+    "@types/qs": {
+      "version": "6.9.7"
+    },
+    "@types/range-parser": {
+      "version": "1.2.4"
+    },
+    "@types/serve-static": {
+      "version": "1.13.10",
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "17.0.29"
+        }
+      }
+    },
+    "@types/sinon": {
+      "version": "7.5.2",
+      "dev": true
+    },
+    "@typescript-eslint/eslint-plugin": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
+      "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/type-utils": "5.33.1",
+        "@typescript-eslint/utils": "5.33.1",
+        "debug": "^4.3.4",
+        "functional-red-black-tree": "^1.0.1",
+        "ignore": "^5.2.0",
+        "regexpp": "^3.2.0",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/parser": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
+      "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/typescript-estree": "5.33.1",
+        "debug": "^4.3.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
+    "@typescript-eslint/scope-manager": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
+      "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/visitor-keys": "5.33.1"
+      }
+    },
+    "@typescript-eslint/type-utils": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
+      "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/utils": "5.33.1",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/types": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
+      "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
+      "dev": true
+    },
+    "@typescript-eslint/typescript-estree": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
+      "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
+      "dev": true,
+      "requires": {
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/visitor-keys": "5.33.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        },
+        "tsutils": {
+          "version": "3.21.0",
+          "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+          "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.8.1"
+          }
+        }
+      }
+    },
+    "@typescript-eslint/utils": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
+      "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
       "dev": true,
       "requires": {
-        "@types/node": "*"
+        "@types/json-schema": "^7.0.9",
+        "@typescript-eslint/scope-manager": "5.33.1",
+        "@typescript-eslint/types": "5.33.1",
+        "@typescript-eslint/typescript-estree": "5.33.1",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^3.0.0"
       }
     },
-    "@types/node": {
-      "version": "8.10.66",
-      "dev": true
-    },
-    "@types/node-fetch": {
-      "version": "3.0.3",
+    "@typescript-eslint/visitor-keys": {
+      "version": "5.33.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
+      "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
       "dev": true,
       "requires": {
-        "node-fetch": "*"
-      }
-    },
-    "@types/qs": {
-      "version": "6.9.7"
-    },
-    "@types/range-parser": {
-      "version": "1.2.4"
-    },
-    "@types/serve-static": {
-      "version": "1.13.10",
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "17.0.29"
-        }
+        "@typescript-eslint/types": "5.33.1",
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
-    "@types/sinon": {
-      "version": "7.5.2",
-      "dev": true
-    },
     "abab": {
       "version": "2.0.6",
       "dev": true
@@ -6711,7 +8344,9 @@
       }
     },
     "acorn": {
-      "version": "8.7.1",
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
       "dev": true
     },
     "acorn-globals": {
@@ -6728,6 +8363,13 @@
         }
       }
     },
+    "acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true,
+      "requires": {}
+    },
     "acorn-walk": {
       "version": "7.2.0",
       "dev": true
@@ -6807,6 +8449,12 @@
       "version": "2.1.1",
       "dev": true
     },
+    "array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true
+    },
     "arrify": {
       "version": "2.0.1",
       "dev": true,
@@ -6888,6 +8536,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
     "brorand": {
       "version": "1.1.0",
       "dev": true
@@ -6904,10 +8561,6 @@
       "version": "1.0.1",
       "dev": true
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "dev": true
-    },
     "bytes": {
       "version": "3.1.2"
     },
@@ -6918,6 +8571,12 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
     "camelcase": {
       "version": "5.3.1",
       "dev": true
@@ -7025,6 +8684,13 @@
     },
     "commander": {
       "version": "2.20.3",
+      "dev": true,
+      "optional": true
+    },
+    "comment-parser": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
+      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
       "dev": true
     },
     "compressible": {
@@ -7198,6 +8864,24 @@
       "version": "3.5.0",
       "dev": true
     },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
     "domexception": {
       "version": "2.0.1",
       "dev": true,
@@ -7343,18 +9027,369 @@
         "source-map": "~0.6.1"
       }
     },
+    "eslint": {
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+      "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
+      "dev": true,
+      "requires": {
+        "@eslint/eslintrc": "^1.3.0",
+        "@humanwhocodes/config-array": "^0.10.4",
+        "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.1.1",
+        "eslint-utils": "^3.0.0",
+        "eslint-visitor-keys": "^3.3.0",
+        "espree": "^9.3.3",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^6.0.1",
+        "globals": "^13.15.0",
+        "globby": "^11.1.0",
+        "grapheme-splitter": "^1.0.4",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "regexpp": "^3.2.0",
+        "strip-ansi": "^6.0.1",
+        "strip-json-comments": "^3.1.0",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "eslint-scope": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
+          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "js-yaml": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+          "dev": true,
+          "requires": {
+            "argparse": "^2.0.1"
+          }
+        },
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+          "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "optionator": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+          "dev": true,
+          "requires": {
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0",
+            "word-wrap": "^1.2.3"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+          "dev": true
+        },
+        "strip-json-comments": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+          "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "dev": true,
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
+    "eslint-config-google": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz",
+      "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-config-prettier": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz",
+      "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-plugin-jsdoc": {
+      "version": "39.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz",
+      "integrity": "sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g==",
+      "dev": true,
+      "requires": {
+        "@es-joy/jsdoccomment": "~0.31.0",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.4.0",
+        "semver": "^7.3.7",
+        "spdx-expression-parse": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
+      }
+    },
     "eslint-plugin-prettier": {
-      "version": "2.7.0",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz",
+      "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==",
+      "dev": true,
+      "requires": {
+        "prettier-linter-helpers": "^1.0.0"
+      }
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "requires": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-visitor-keys": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
+      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
+      "dev": true
+    },
+    "espree": {
+      "version": "9.3.3",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
+      "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
       "dev": true,
       "requires": {
-        "fast-diff": "^1.1.1",
-        "jest-docblock": "^21.0.0"
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.3.0"
       }
     },
     "esprima": {
       "version": "4.0.1",
       "dev": true
     },
+    "esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.1.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      }
+    },
     "estraverse": {
       "version": "5.3.0",
       "dev": true
@@ -7418,8 +9453,34 @@
     },
     "fast-diff": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
+      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
       "dev": true
     },
+    "fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        }
+      }
+    },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "dev": true
@@ -7433,6 +9494,15 @@
       "dev": true,
       "optional": true
     },
+    "fastq": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "dev": true,
+      "requires": {
+        "reusify": "^1.0.4"
+      }
+    },
     "faye-websocket": {
       "version": "0.11.4",
       "dev": true,
@@ -7440,6 +9510,24 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dev": true,
+      "requires": {
+        "flat-cache": "^3.0.4"
+      }
+    },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "finalhandler": {
       "version": "1.2.0",
       "requires": {
@@ -7490,6 +9578,22 @@
         "is-buffer": "~2.0.3"
       }
     },
+    "flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dev": true,
+      "requires": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "flatted": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
+    },
     "form-data": {
       "version": "3.0.1",
       "dev": true,
@@ -7523,8 +9627,7 @@
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "functions-have-names": {
       "version": "1.2.3",
@@ -7587,6 +9690,38 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+    "glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
+      "requires": {
+        "is-glob": "^4.0.3"
+      }
+    },
+    "globals": {
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+      "dev": true,
+      "requires": {
+        "type-fest": "^0.20.2"
+      }
+    },
+    "globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "requires": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      }
+    },
     "google-auth-library": {
       "version": "7.14.1",
       "dev": true,
@@ -7650,6 +9785,12 @@
       "version": "4.2.10",
       "dev": true
     },
+    "grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "dev": true
+    },
     "growl": {
       "version": "1.10.5",
       "dev": true
@@ -7794,14 +9935,29 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true
+    },
+    "import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dev": true,
+      "requires": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      }
+    },
     "import-lazy": {
       "version": "4.0.0",
       "dev": true
     },
     "imurmurhash": {
       "version": "0.1.4",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
@@ -7871,14 +10027,35 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "dev": true
     },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
     "is-negative-zero": {
       "version": "2.0.2",
       "dev": true
     },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "is-number-object": {
       "version": "1.0.7",
       "dev": true,
@@ -7954,10 +10131,6 @@
       "version": "2.0.0",
       "dev": true
     },
-    "jest-docblock": {
-      "version": "21.2.0",
-      "dev": true
-    },
     "jju": {
       "version": "1.4.0",
       "dev": true
@@ -7969,10 +10142,6 @@
         "@panva/asn1.js": "^1.0.0"
       }
     },
-    "js-tokens": {
-      "version": "4.0.0",
-      "dev": true
-    },
     "js-yaml": {
       "version": "3.14.1",
       "dev": true,
@@ -7981,6 +10150,12 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsdoc-type-pratt-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
+      "integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
+      "dev": true
+    },
     "jsdom": {
       "version": "16.7.0",
       "dev": true,
@@ -8072,14 +10247,14 @@
       "version": "0.4.1",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
       "dev": true
     },
-    "jsonc-parser": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz",
-      "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==",
+    "json-stringify-safe": {
+      "version": "5.0.1",
       "dev": true
     },
     "jsonfile": {
@@ -8211,10 +10386,6 @@
       "version": "1.1.5",
       "dev": true
     },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "dev": true
-    },
     "locate-path": {
       "version": "3.0.0",
       "dev": true,
@@ -8224,7 +10395,8 @@
       }
     },
     "lodash": {
-      "version": "4.17.21"
+      "version": "4.17.21",
+      "dev": true
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -8267,6 +10439,12 @@
       "version": "4.0.1",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "lodash.once": {
       "version": "4.1.1",
       "dev": true
@@ -8320,10 +10498,6 @@
         }
       }
     },
-    "lunr": {
-      "version": "2.3.9",
-      "dev": true
-    },
     "make-dir": {
       "version": "3.1.0",
       "dev": true,
@@ -8343,21 +10517,31 @@
       "version": "1.3.6",
       "dev": true
     },
-    "marked": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz",
-      "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==",
-      "dev": true
-    },
     "media-typer": {
       "version": "0.3.0"
     },
     "merge-descriptors": {
       "version": "1.0.1"
     },
+    "merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "dev": true
+    },
     "methods": {
       "version": "1.1.2"
     },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
     "mime": {
       "version": "1.6.0"
     },
@@ -8564,6 +10748,12 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
+    },
     "negotiator": {
       "version": "0.6.3"
     },
@@ -8736,7 +10926,6 @@
     "p-limit": {
       "version": "3.1.0",
       "dev": true,
-      "optional": true,
       "requires": {
         "yocto-queue": "^0.1.0"
       }
@@ -8761,6 +10950,15 @@
       "version": "2.2.0",
       "dev": true
     },
+    "parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "requires": {
+        "callsites": "^3.0.0"
+      }
+    },
     "parse5": {
       "version": "6.0.1",
       "dev": true
@@ -8776,6 +10974,12 @@
       "version": "1.0.1",
       "dev": true
     },
+    "path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true
+    },
     "path-parse": {
       "version": "1.0.7",
       "dev": true
@@ -8783,10 +10987,22 @@
     "path-to-regexp": {
       "version": "0.1.7"
     },
+    "path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true
+    },
     "pathval": {
       "version": "1.1.1",
       "dev": true
     },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true
+    },
     "portfinder": {
       "version": "1.0.28",
       "dev": true,
@@ -8821,9 +11037,20 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.19.1",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
+      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true
     },
+    "prettier-linter-helpers": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+      "dev": true,
+      "requires": {
+        "fast-diff": "^1.1.2"
+      }
+    },
     "promise-polyfill": {
       "version": "6.1.0",
       "dev": true
@@ -8911,6 +11138,12 @@
         "side-channel": "^1.0.4"
       }
     },
+    "queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true
+    },
     "range-parser": {
       "version": "1.2.1"
     },
@@ -8942,6 +11175,12 @@
         "functions-have-names": "^1.2.2"
       }
     },
+    "regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "dev": true
@@ -8963,6 +11202,12 @@
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
+    "resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true
+    },
     "retry": {
       "version": "0.13.1",
       "dev": true,
@@ -8992,6 +11237,30 @@
         }
       }
     },
+    "reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "dev": true,
+      "requires": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
     "safe-buffer": {
       "version": "5.2.1"
     },
@@ -9064,17 +11333,21 @@
     "setprototypeof": {
       "version": "1.2.0"
     },
-    "shiki": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz",
-      "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==",
+    "shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "requires": {
-        "jsonc-parser": "^3.0.0",
-        "vscode-oniguruma": "^1.6.1",
-        "vscode-textmate": "5.2.0"
+        "shebang-regex": "^3.0.0"
       }
     },
+    "shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true
+    },
     "side-channel": {
       "version": "1.0.4",
       "requires": {
@@ -9110,10 +11383,38 @@
         }
       }
     },
+    "slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true
+    },
     "source-map": {
       "version": "0.6.1",
       "dev": true
     },
+    "spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
+      "dev": true
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.12",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
+      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "dev": true
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "dev": true
@@ -9218,6 +11519,12 @@
       "version": "1.0.0",
       "dev": true
     },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
+    },
     "thenify": {
       "version": "3.3.1",
       "dev": true,
@@ -9236,6 +11543,15 @@
       "version": "0.3.0",
       "dev": true
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "toidentifier": {
       "version": "1.0.1"
     },
@@ -9285,91 +11601,6 @@
       "version": "2.4.0",
       "dev": true
     },
-    "tslint": {
-      "version": "5.20.1",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^4.0.1",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "4.0.2",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "dev": true
-        },
-        "tslib": {
-          "version": "1.14.1",
-          "dev": true
-        }
-      }
-    },
-    "tslint-config-prettier": {
-      "version": "1.18.0",
-      "dev": true
-    },
-    "tslint-no-unused-expression-chai": {
-      "version": "0.1.4",
-      "dev": true,
-      "requires": {
-        "tsutils": "^3.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "dev": true
-        },
-        "tsutils": {
-          "version": "3.21.0",
-          "dev": true,
-          "requires": {
-            "tslib": "^1.8.1"
-          }
-        }
-      }
-    },
-    "tslint-plugin-prettier": {
-      "version": "2.3.0",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-prettier": "^2.2.0",
-        "lines-and-columns": "^1.1.6",
-        "tslib": "^1.7.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "dev": true
-        }
-      }
-    },
-    "tsutils": {
-      "version": "2.29.0",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "dev": true
-        }
-      }
-    },
     "type-check": {
       "version": "0.3.2",
       "dev": true,
@@ -9381,6 +11612,12 @@
       "version": "4.0.8",
       "dev": true
     },
+    "type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true
+    },
     "type-is": {
       "version": "1.6.18",
       "requires": {
@@ -9396,38 +11633,6 @@
         "is-typedarray": "^1.0.0"
       }
     },
-    "typedoc": {
-      "version": "0.23.7",
-      "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.23.7.tgz",
-      "integrity": "sha512-Vl/Yh4KYBaxQQOYImBgLQDX61hfaA7XaP/DZVd/w7rQvaqLEsdQH6gEMK8CMjyHo0bSzVnNYwxtD1KPSENoWug==",
-      "dev": true,
-      "requires": {
-        "lunr": "^2.3.9",
-        "marked": "^4.0.16",
-        "minimatch": "^5.1.0",
-        "shiki": "^0.10.1"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
-      }
-    },
     "typescript": {
       "version": "4.6.3",
       "dev": true
@@ -9476,6 +11681,12 @@
       "version": "8.3.2",
       "dev": true
     },
+    "v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
+      "dev": true
+    },
     "v8-compile-cache-lib": {
       "version": "3.0.1",
       "dev": true
@@ -9487,18 +11698,6 @@
     "vary": {
       "version": "1.1.2"
     },
-    "vscode-oniguruma": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz",
-      "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==",
-      "dev": true
-    },
-    "vscode-textmate": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz",
-      "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==",
-      "dev": true
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "dev": true,
@@ -9855,8 +12054,7 @@
     },
     "yocto-queue": {
       "version": "0.1.0",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "z-schema": {
       "version": "3.18.4",
diff --git a/package.json b/package.json
index 56e1ce4f7..b705431c5 100644
--- a/package.json
+++ b/package.json
@@ -21,42 +21,30 @@
   "files": [
     "lib"
   ],
-  "main": "lib/index.js",
+  "main": "lib/v1/index.js",
   "bin": {
     "firebase-functions": "./lib/bin/firebase-functions.js"
   },
-  "types": "lib/index.d.ts",
+  "types": "lib/v1/index.d.ts",
   "exports": {
-    ".": "./lib/index.js",
+    ".": "./lib/v1/index.js",
     "./logger/compat": "./lib/logger/compat.js",
-    "./lib/logger/compat": "./lib/logger/compat.js",
     "./logger": "./lib/logger/index.js",
-    "./lib/logger": "./lib/logger/index.js",
-    "./lib/providers/auth": "./lib/providers/auth.js",
-    "./lib/providers/analytics": "./lib/providers/analytics.js",
-    "./lib/providers/database": "./lib/providers/database.js",
-    "./lib/providers/firestore": "./lib/providers/firestore.js",
-    "./lib/providers/https": "./lib/providers/https.js",
-    "./lib/providers/pubsub": "./lib/providers/pubsub.js",
-    "./lib/providers/remoteConfig": "./lib/providers/remoteConfig.js",
-    "./lib/providers/storage": "./lib/providers/storage.js",
-    "./lib/providers/tasks": "./lib/providers/tasks.js",
-    "./lib/providers/testLab": "./lib/providers/testLab.js",
-    "./v1": "./lib/index.js",
-    "./v1/analytics": "./lib/providers/analytics.js",
-    "./v1/auth": "./lib/providers/auth.js",
-    "./v1/database": "./lib/providers/database.js",
-    "./v1/firestore": "./lib/providers/firestore.js",
-    "./v1/https": "./lib/providers/https.js",
-    "./v1/pubsub": "./lib/providers/pubsub.js",
-    "./v1/remoteConfig": "./lib/providers/remoteConfig.js",
-    "./v1/storage": "./lib/providers/storage.js",
-    "./v1/testLab": "./lib/providers/testLab.js",
+    "./params": "./lib/params/index.js",
+    "./v1": "./lib/v1/index.js",
+    "./v1/analytics": "./lib/v1/providers/analytics.js",
+    "./v1/auth": "./lib/v1/providers/auth.js",
+    "./v1/database": "./lib/v1/providers/database.js",
+    "./v1/firestore": "./lib/v1/providers/firestore.js",
+    "./v1/pubsub": "./lib/v1/providers/pubsub.js",
+    "./v1/remoteConfig": "./lib/v1/providers/remoteConfig.js",
+    "./v1/storage": "./lib/v1/providers/storage.js",
+    "./v1/tasks": "./lib/v1/providers/tasks.js",
+    "./v1/testLab": "./lib/v1/providers/testLab.js",
     "./v2": "./lib/v2/index.js",
     "./v2/core": "./lib/v2/core.js",
     "./v2/options": "./lib/v2/options.js",
     "./v2/https": "./lib/v2/providers/https.js",
-    "./v2/params": "./lib/v2/params/index.js",
     "./v2/pubsub": "./lib/v2/providers/pubsub.js",
     "./v2/storage": "./lib/v2/providers/storage.js",
     "./v2/tasks": "./lib/v2/providers/tasks.js",
@@ -68,7 +56,9 @@
     "./v2/eventarc": "./lib/v2/providers/eventarc.js",
     "./v2/identity": "./lib/v2/providers/identity.js",
     "./v2/database": "./lib/v2/providers/database.js",
-    "./v2/scheduler": "./lib/v2/providers/scheduler.js"
+    "./v2/scheduler": "./lib/v2/providers/scheduler.js",
+    "./v2/remoteConfig": "./lib/v2/providers/remoteConfig.js",
+    "./v2/testLab": "./lib/v2/providers/testLab.js"
   },
   "typesVersions": {
     "*": {
@@ -78,38 +68,38 @@
       "logger/compat": [
         "lib/logger/compat"
       ],
+      "params": [
+        "lib/params"
+      ],
       "v1": [
-        "lib"
+        "lib/v1"
       ],
       "v1/analytics": [
-        "lib/providers/analytics"
+        "./lib/v1/providers/analytics"
       ],
       "v1/auth": [
-        "lib/providers/auth"
+        "./lib/v1/providers/auth"
       ],
       "v1/database": [
-        "lib/providers/database"
+        "./lib/v1/privders/database"
       ],
       "v1/firestore": [
-        "lib/providers/firestore"
-      ],
-      "v1/https": [
-        "lib/providers/https"
+        "./lib/v1/providers/firestore"
       ],
       "v1/pubsub": [
-        "lib/providers/pubsub"
+        "./lib/v1/providers/pubsub"
       ],
-      "v1/remoteConfig": [
-        "lib/providers/remoteConfig"
+      "/v1/remoteConfig": [
+        "./lib/v1/providers/remoteConfig"
       ],
-      "v1/storage": [
-        "lib/providers/storage"
+      "/v1/storage": [
+        "./lib/v1/providers/storage"
       ],
-      "v1/tasks": [
-        "lib/providers/tasks"
+      "/v1/tasks": [
+        "./lib/v1/providers/tasks"
       ],
-      "v1/testLab": [
-        "lib/providers/testLab"
+      "/v1/testLab": [
+        "./lib/v1/providers/testLab"
       ],
       "v2": [
         "lib/v2"
@@ -147,9 +137,6 @@
       "v2/https": [
         "lib/v2/providers/https"
       ],
-      "v2/params": [
-        "lib/v2/params"
-      ],
       "v2/pubsub": [
         "lib/v2/providers/pubsub"
       ],
@@ -161,6 +148,12 @@
       ],
       "v2/scheduler": [
         "lib/v2/providers/scheduler"
+      ],
+      "v2/remoteConfig": [
+        "lib/v2/providers/remoteConfig"
+      ],
+      "v2/testLab": [
+        "lib/v2/providers/testLab"
       ]
     }
   },
@@ -168,23 +161,25 @@
     "registry": "https://wombat-dressing-room.appspot.com"
   },
   "scripts": {
-    "apidocs": "node docgen/generate-docs.js",
     "docgen:v1:extract": "api-extractor run -c docgen/api-extractor.v1.json --local",
-    "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1/markdown --output docgen/v1/markdown/toc --path /docs/reference/functions",
+    "docgen:v1:toc": "ts-node docgen/toc.ts --input docgen/v1 --output docgen/v1/markdown/toc --path /docs/reference/functions",
     "docgen:v1:gen": "api-documenter-fire markdown -i docgen/v1 -o docgen/v1/markdown --project functions && npm run docgen:v1:toc",
     "docgen:v1": "npm run build && npm run docgen:v1:extract && npm run docgen:v1:gen",
     "docgen:v2:extract": "api-extractor run -c docgen/api-extractor.v2.json --local",
-    "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2/markdown --output docgen/v2/markdown/toc --path /docs/functions/beta/reference",
+    "docgen:v2:toc": "ts-node docgen/toc.ts --input docgen/v2 --output docgen/v2/markdown/toc --path /docs/functions/beta/reference",
     "docgen:v2:gen": "api-documenter-fire markdown -i docgen/v2 -o docgen/v2/markdown --project functions && npm run docgen:v2:toc",
     "docgen:v2": "npm run build && npm run docgen:v2:extract && npm run docgen:v2:gen",
     "build:pack": "rm -rf lib && npm install && tsc -p tsconfig.release.json && npm pack",
     "build:release": "npm ci --production && npm install --no-save typescript firebase-admin && tsc -p tsconfig.release.json",
     "build": "tsc -p tsconfig.release.json",
     "build:watch": "npm run build -- -w",
-    "format": "prettier --check '**/*.{json,md,ts,yml,yaml}'",
-    "format:fix": "prettier --write '**/*.{json,md,ts,yml,yaml}'",
-    "lint": "tslint --config tslint.json --project tsconfig.json ",
-    "lint:fix": "tslint --config tslint.json --fix --project tsconfig.json",
+    "format": "npm run format:ts && npm run format:other",
+    "format:other": "npm run lint:other -- --write",
+    "format:ts": "npm run lint:ts -- --fix --quiet",
+    "lint": "npm run lint:ts && npm run lint:other",
+    "lint:other": "prettier --check '**/*.{md,yaml,yml}'",
+    "lint:quiet": "npm run lint:ts -- --quiet && npm run lint:other",
+    "lint:ts": "eslint --config .eslintrc.js --ext .ts,.js .",
     "test": "mocha --file ./mocha/setup.ts \"spec/**/*.spec.ts\"",
     "test:bin": "./scripts/bin-test/run.sh",
     "test:postmerge": "./integration_test/run_tests.sh"
@@ -194,7 +189,6 @@
     "@types/express": "4.17.3",
     "cors": "^2.8.5",
     "express": "^4.17.1",
-    "lodash": "^4.17.14",
     "node-fetch": "^2.6.7"
   },
   "devDependencies": {
@@ -204,17 +198,23 @@
     "@types/chai": "^4.1.7",
     "@types/chai-as-promised": "^7.1.0",
     "@types/jsonwebtoken": "^8.3.2",
-    "@types/lodash": "^4.14.135",
     "@types/mocha": "^5.2.7",
     "@types/mock-require": "^2.0.0",
     "@types/nock": "^10.0.3",
-    "@types/node": "^8.10.50",
+    "@types/node": "^14.18.24",
     "@types/node-fetch": "^3.0.3",
     "@types/sinon": "^7.0.13",
+    "@typescript-eslint/eslint-plugin": "^5.33.1",
+    "@typescript-eslint/parser": "^5.33.1",
     "api-extractor-model-me": "^0.1.1",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "child-process-promise": "^2.2.1",
+    "eslint": "^8.6.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-jsdoc": "^39.2.9",
+    "eslint-plugin-prettier": "^4.0.0",
     "firebase-admin": "^10.3.0",
     "js-yaml": "^3.13.1",
     "jsdom": "^16.2.1",
@@ -226,22 +226,17 @@
     "nock": "^10.0.6",
     "node-fetch": "^2.6.7",
     "portfinder": "^1.0.28",
-    "prettier": "^1.18.2",
+    "prettier": "^2.7.1",
     "semver": "^7.3.5",
     "sinon": "^7.3.2",
     "ts-node": "^10.4.0",
-    "tslint": "^5.18.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-no-unused-expression-chai": "^0.1.4",
-    "tslint-plugin-prettier": "^2.0.1",
-    "typedoc": "0.23.7",
     "typescript": "^4.3.5",
     "yargs": "^15.3.1"
   },
   "peerDependencies": {
-    "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
+    "firebase-admin": "^10.0.0 || ^11.0.0"
   },
   "engines": {
-    "node": "^8.13.0 || >=10.10.0"
+    "node": ">=14.10.0"
   }
 }
diff --git a/scripts/bin-test/mocha-setup.ts b/scripts/bin-test/mocha-setup.ts
index 6dfdc7f9d..21b3996d1 100644
--- a/scripts/bin-test/mocha-setup.ts
+++ b/scripts/bin-test/mocha-setup.ts
@@ -1,4 +1,4 @@
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
+import * as chai from "chai";
+import * as chaiAsPromised from "chai-as-promised";
 
 chai.use(chaiAsPromised);
diff --git a/scripts/bin-test/sources/commonjs-preserve/index.js b/scripts/bin-test/sources/commonjs-preserve/index.js
new file mode 100644
index 000000000..7c953dec8
--- /dev/null
+++ b/scripts/bin-test/sources/commonjs-preserve/index.js
@@ -0,0 +1,18 @@
+const functions = require("firebase-functions");
+const functionsv2 = require("firebase-functions/v2");
+
+exports.v1http = functions.https.onRequest((req, resp) => {
+  resp.status(200).send("PASS");
+});
+
+exports.v1httpPreserve = functions
+  .runWith({ preserveExternalChanges: true })
+  .https.onRequest((req, resp) => {
+    resp.status(200).send("PASS");
+  });
+
+functionsv2.setGlobalOptions({ preserveExternalChanges: true });
+
+exports.v2http = functionsv2.https.onRequest((req, resp) => {
+  resp.status(200).send("PASS");
+});
diff --git a/scripts/bin-test/sources/commonjs-preserve/package.json b/scripts/bin-test/sources/commonjs-preserve/package.json
new file mode 100644
index 000000000..7fdf4e928
--- /dev/null
+++ b/scripts/bin-test/sources/commonjs-preserve/package.json
@@ -0,0 +1,3 @@
+{
+  "name": "commonjs-preserve"
+}
diff --git a/scripts/bin-test/test.ts b/scripts/bin-test/test.ts
index 154c2295c..b15012d70 100644
--- a/scripts/bin-test/test.ts
+++ b/scripts/bin-test/test.ts
@@ -1,46 +1,64 @@
-import * as subprocess from 'child_process';
-import * as path from 'path';
-import { promisify } from 'util';
+import * as subprocess from "child_process";
+import * as path from "path";
+import { promisify } from "util";
 
-import { expect } from 'chai';
-import * as yaml from 'js-yaml';
-import fetch from 'node-fetch';
-import * as portfinder from 'portfinder';
-import * as semver from 'semver';
+import { expect } from "chai";
+import * as yaml from "js-yaml";
+import fetch from "node-fetch";
+import * as portfinder from "portfinder";
+import * as semver from "semver";
 
 const TIMEOUT_XL = 20_000;
 const TIMEOUT_L = 10_000;
 const TIMEOUT_M = 5_000;
 const TIMEOUT_S = 1_000;
 
+const DEFAULT_OPTIONS = {
+  availableMemoryMb: null,
+  maxInstances: null,
+  minInstances: null,
+  timeoutSeconds: null,
+  vpc: null,
+  serviceAccountEmail: null,
+  ingressSettings: null,
+};
+
+const DEFAULT_V1_OPTIONS = { ...DEFAULT_OPTIONS };
+
+const DEFAULT_V2_OPTIONS = { ...DEFAULT_OPTIONS, concurrency: null };
+
 const BASE_STACK = {
   endpoints: {
     v1http: {
-      platform: 'gcfv1',
-      entryPoint: 'v1http',
+      ...DEFAULT_V1_OPTIONS,
+      platform: "gcfv1",
+      entryPoint: "v1http",
       httpsTrigger: {},
     },
     v1callable: {
-      platform: 'gcfv1',
-      entryPoint: 'v1callable',
+      ...DEFAULT_V1_OPTIONS,
+      platform: "gcfv1",
+      entryPoint: "v1callable",
       labels: {},
       callableTrigger: {},
     },
     v2http: {
-      platform: 'gcfv2',
-      entryPoint: 'v2http',
+      ...DEFAULT_V2_OPTIONS,
+      platform: "gcfv2",
+      entryPoint: "v2http",
       labels: {},
       httpsTrigger: {},
     },
     v2callable: {
-      platform: 'gcfv2',
-      entryPoint: 'v2callable',
+      ...DEFAULT_V2_OPTIONS,
+      platform: "gcfv2",
+      entryPoint: "v2callable",
       labels: {},
       callableTrigger: {},
     },
   },
   requiredAPIs: [],
-  specVersion: 'v1alpha1',
+  specVersion: "v1alpha1",
 };
 
 interface Testcase {
@@ -61,11 +79,11 @@ async function retryUntil(
   };
   const timedOut = new Promise<never>((resolve, reject) => {
     setTimeout(() => {
-      reject(new Error('retry timeout'));
+      reject(new Error("retry timeout"));
     }, timeoutMs);
   });
   const retry = (async () => {
-    while (true) {
+    for (;;) {
       if (await fn()) {
         break;
       }
@@ -82,25 +100,25 @@ async function startBin(
   const getPort = promisify(portfinder.getPort) as () => Promise<number>;
   const port = await getPort();
 
-  const proc = subprocess.spawn('./node_modules/.bin/firebase-functions', [], {
+  const proc = subprocess.spawn("npx", ["firebase-functions"], {
     cwd: path.resolve(tc.modulePath),
     env: {
       PATH: process.env.PATH,
-      GLCOUD_PROJECT: 'test-project',
-      PORT: port,
-      FUNCTIONS_CONTROL_API: 'true',
+      GLCOUD_PROJECT: "test-project",
+      PORT: port.toString(),
+      FUNCTIONS_CONTROL_API: "true",
     },
   });
 
   if (!proc) {
-    throw new Error('Failed to start firebase functions');
+    throw new Error("Failed to start firebase functions");
   }
 
   await retryUntil(async () => {
     try {
       await fetch(`http://localhost:${port}/__/functions.yaml`);
     } catch (e) {
-      if (e?.code === 'ECONNREFUSED') {
+      if (e?.code === "ECONNREFUSED") {
         return false;
       }
       throw e;
@@ -109,12 +127,12 @@ async function startBin(
   }, TIMEOUT_M);
 
   if (debug) {
-    proc.stdout?.on('data', (data: unknown) => {
-      console.log(`[${tc.name} stdout] ` + data);
+    proc.stdout?.on("data", (data: unknown) => {
+      console.log(`[${tc.name} stdout] ${data}`);
     });
 
-    proc.stderr?.on('data', (data: unknown) => {
-      console.log(`[${tc.name} stderr] ` + data);
+    proc.stderr?.on("data", (data: unknown) => {
+      console.log(`[${tc.name} stderr] ${data}`);
     });
   }
 
@@ -127,16 +145,16 @@ async function startBin(
           process.kill(proc.pid, 0);
         } catch {
           // process.kill w/ signal 0 will throw an error if the pid no longer exists.
-          return true;
+          return Promise.resolve(true);
         }
-        return false;
+        return Promise.resolve(false);
       }, TIMEOUT_M);
     },
   };
 }
 
-describe('functions.yaml', () => {
-  async function runTests(tc: Testcase) {
+describe("functions.yaml", () => {
+  function runTests(tc: Testcase) {
     let port: number;
     let cleanup: () => Promise<void>;
 
@@ -150,85 +168,114 @@ describe('functions.yaml', () => {
       await cleanup?.();
     });
 
-    it('functions.yaml returns expected Manifest', async () => {
+    it("functions.yaml returns expected Manifest", async () => {
       const res = await fetch(`http://localhost:${port}/__/functions.yaml`);
       const text = await res.text();
       let parsed: any;
       try {
         parsed = yaml.load(text);
       } catch (err) {
-        throw new Error('Failed to parse functions.yaml ' + err);
+        throw new Error(`Failed to parse functions.yaml: ${err}`);
       }
       expect(parsed).to.be.deep.equal(tc.expected);
     });
   }
 
-  describe('commonjs', () => {
+  describe("commonjs", () => {
     const testcases: Testcase[] = [
       {
-        name: 'basic',
-        modulePath: './scripts/bin-test/sources/commonjs',
+        name: "basic",
+        modulePath: "./scripts/bin-test/sources/commonjs",
         expected: BASE_STACK,
       },
       {
-        name: 'has main',
-        modulePath: './scripts/bin-test/sources/commonjs-main',
+        name: "has main",
+        modulePath: "./scripts/bin-test/sources/commonjs-main",
         expected: BASE_STACK,
       },
       {
-        name: 'grouped',
-        modulePath: './scripts/bin-test/sources/commonjs-grouped',
+        name: "grouped",
+        modulePath: "./scripts/bin-test/sources/commonjs-grouped",
         expected: {
           ...BASE_STACK,
           endpoints: {
             ...BASE_STACK.endpoints,
-            'g1-groupedhttp': {
-              platform: 'gcfv1',
-              entryPoint: 'g1.groupedhttp',
+            "g1-groupedhttp": {
+              ...DEFAULT_V1_OPTIONS,
+              platform: "gcfv1",
+              entryPoint: "g1.groupedhttp",
               httpsTrigger: {},
             },
-            'g1-groupedcallable': {
-              platform: 'gcfv1',
-              entryPoint: 'g1.groupedcallable',
+            "g1-groupedcallable": {
+              ...DEFAULT_V1_OPTIONS,
+              platform: "gcfv1",
+              entryPoint: "g1.groupedcallable",
               labels: {},
               callableTrigger: {},
             },
           },
         },
       },
+      {
+        name: "preserveChange",
+        modulePath: "./scripts/bin-test/sources/commonjs-preserve",
+        expected: {
+          endpoints: {
+            v1http: {
+              ...DEFAULT_V1_OPTIONS,
+              platform: "gcfv1",
+              entryPoint: "v1http",
+              httpsTrigger: {},
+            },
+            v1httpPreserve: {
+              platform: "gcfv1",
+              entryPoint: "v1httpPreserve",
+              httpsTrigger: {},
+            },
+            v2http: {
+              platform: "gcfv2",
+              entryPoint: "v2http",
+              labels: {},
+              httpsTrigger: {},
+            },
+          },
+          requiredAPIs: [],
+          specVersion: "v1alpha1",
+        },
+      },
     ];
 
     for (const tc of testcases) {
-      describe(tc.name, async () => {
-        await runTests(tc);
+      describe(tc.name, () => {
+        runTests(tc);
       });
     }
   }).timeout(TIMEOUT_L);
 
-  if (semver.gt(process.versions.node, '13.2.0')) {
-    describe('esm', () => {
+  if (semver.gt(process.versions.node, "13.2.0")) {
+    describe("esm", () => {
       const testcases: Testcase[] = [
         {
-          name: 'basic',
-          modulePath: './scripts/bin-test/sources/esm',
+          name: "basic",
+          modulePath: "./scripts/bin-test/sources/esm",
           expected: BASE_STACK,
         },
         {
-          name: 'with main',
+          name: "with main",
 
-          modulePath: './scripts/bin-test/sources/esm-main',
+          modulePath: "./scripts/bin-test/sources/esm-main",
           expected: BASE_STACK,
         },
         {
-          name: 'with .m extension',
-          modulePath: './scripts/bin-test/sources/esm-ext',
+          name: "with .m extension",
+          modulePath: "./scripts/bin-test/sources/esm-ext",
           expected: BASE_STACK,
         },
       ];
 
       for (const tc of testcases) {
-        describe(tc.name, async () => {
-          await runTests(tc);
+        describe(tc.name, () => {
+          runTests(tc);
         });
       }
     }).timeout(TIMEOUT_L);
diff --git a/scripts/publish-container/cloudbuild.yaml b/scripts/publish-container/cloudbuild.yaml
index 7a99a8cab..da60d1233 100644
--- a/scripts/publish-container/cloudbuild.yaml
+++ b/scripts/publish-container/cloudbuild.yaml
@@ -1,4 +1,4 @@
 steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 'gcr.io/$PROJECT_ID/package-builder', '.']
-images: ['gcr.io/$PROJECT_ID/package-builder']
+  - name: "gcr.io/cloud-builders/docker"
+    args: ["build", "-t", "gcr.io/$PROJECT_ID/package-builder", "."]
+images: ["gcr.io/$PROJECT_ID/package-builder"]
diff --git a/scripts/publish/cloudbuild.yaml b/scripts/publish/cloudbuild.yaml
index d04fec25c..96b811597 100644
--- a/scripts/publish/cloudbuild.yaml
+++ b/scripts/publish/cloudbuild.yaml
@@ -1,61 +1,61 @@
 steps:
   # Decrypt the SSH key.
-  - name: 'gcr.io/cloud-builders/gcloud'
+  - name: "gcr.io/cloud-builders/gcloud"
     args:
       [
-        'kms',
-        'decrypt',
-        '--ciphertext-file=deploy_key.enc',
-        '--plaintext-file=/root/.ssh/id_rsa',
-        '--location=global',
-        '--keyring=${_KEY_RING}',
-        '--key=${_KEY_NAME}',
+        "kms",
+        "decrypt",
+        "--ciphertext-file=deploy_key.enc",
+        "--plaintext-file=/root/.ssh/id_rsa",
+        "--location=global",
+        "--keyring=${_KEY_RING}",
+        "--key=${_KEY_NAME}",
       ]
 
   # Decrypt the Twitter credentials.
-  - name: 'gcr.io/cloud-builders/gcloud'
+  - name: "gcr.io/cloud-builders/gcloud"
     args:
       [
-        'kms',
-        'decrypt',
-        '--ciphertext-file=twitter.json.enc',
-        '--plaintext-file=twitter.json',
-        '--location=global',
-        '--keyring=${_KEY_RING}',
-        '--key=${_KEY_NAME}',
+        "kms",
+        "decrypt",
+        "--ciphertext-file=twitter.json.enc",
+        "--plaintext-file=twitter.json",
+        "--location=global",
+        "--keyring=${_KEY_RING}",
+        "--key=${_KEY_NAME}",
       ]
 
   # Decrypt the npm credentials.
-  - name: 'gcr.io/cloud-builders/gcloud'
+  - name: "gcr.io/cloud-builders/gcloud"
     args:
       [
-        'kms',
-        'decrypt',
-        '--ciphertext-file=npmrc.enc',
-        '--plaintext-file=npmrc',
-        '--location=global',
-        '--keyring=${_KEY_RING}',
-        '--key=${_KEY_NAME}',
+        "kms",
+        "decrypt",
+        "--ciphertext-file=npmrc.enc",
+        "--plaintext-file=npmrc",
+        "--location=global",
+        "--keyring=${_KEY_RING}",
+        "--key=${_KEY_NAME}",
       ]
 
   # Decrypt the hub (GitHub) credentials.
-  - name: 'gcr.io/cloud-builders/gcloud'
+  - name: "gcr.io/cloud-builders/gcloud"
     args:
       [
-        'kms',
-        'decrypt',
-        '--ciphertext-file=hub.enc',
-        '--plaintext-file=hub',
-        '--location=global',
-        '--keyring=${_KEY_RING}',
-        '--key=${_KEY_NAME}',
+        "kms",
+        "decrypt",
+        "--ciphertext-file=hub.enc",
+        "--plaintext-file=hub",
+        "--location=global",
+        "--keyring=${_KEY_RING}",
+        "--key=${_KEY_NAME}",
       ]
 
   # Set up git with key and domain.
-  - name: 'gcr.io/cloud-builders/git'
-    entrypoint: 'bash'
+  - name: "gcr.io/cloud-builders/git"
+    entrypoint: "bash"
     args:
-      - '-c'
+      - "-c"
       - |
         chmod 600 /root/.ssh/id_rsa
         cat <<EOF >/root/.ssh/config
@@ -65,50 +65,50 @@ steps:
         ssh-keyscan github.com >> /root/.ssh/known_hosts
 
   # Clone the repository.
-  - name: 'gcr.io/cloud-builders/git'
-    args: ['clone', 'git@github.com:${_REPOSITORY_ORG}/${_REPOSITORY_NAME}']
+  - name: "gcr.io/cloud-builders/git"
+    args: ["clone", "git@github.com:${_REPOSITORY_ORG}/${_REPOSITORY_NAME}"]
 
   # Set up the Git configuration.
-  - name: 'gcr.io/cloud-builders/git'
-    dir: '${_REPOSITORY_NAME}'
-    args: ['config', '--global', 'user.email', 'firebase-oss-bot@google.com']
-  - name: 'gcr.io/cloud-builders/git'
-    dir: '${_REPOSITORY_NAME}'
-    args: ['config', '--global', 'user.name', 'Google Open Source Bot']
+  - name: "gcr.io/cloud-builders/git"
+    dir: "${_REPOSITORY_NAME}"
+    args: ["config", "--global", "user.email", "firebase-oss-bot@google.com"]
+  - name: "gcr.io/cloud-builders/git"
+    dir: "${_REPOSITORY_NAME}"
+    args: ["config", "--global", "user.name", "Google Open Source Bot"]
 
   # Set up the Twitter credentials.
-  - name: 'gcr.io/$PROJECT_ID/package-builder'
-    entrypoint: 'cp'
-    args: ['-v', 'twitter.json', '${_REPOSITORY_NAME}/scripts/twitter.json']
+  - name: "gcr.io/$PROJECT_ID/package-builder"
+    entrypoint: "cp"
+    args: ["-v", "twitter.json", "${_REPOSITORY_NAME}/scripts/twitter.json"]
 
   # Set up the npm credentials.
-  - name: 'gcr.io/$PROJECT_ID/package-builder'
-    entrypoint: 'bash'
-    args: ['-c', 'cp -v npmrc ~/.npmrc']
+  - name: "gcr.io/$PROJECT_ID/package-builder"
+    entrypoint: "bash"
+    args: ["-c", "cp -v npmrc ~/.npmrc"]
 
   # Set up the hub credentials for package-builder.
-  - name: 'gcr.io/$PROJECT_ID/package-builder'
-    entrypoint: 'bash'
-    args: ['-c', 'mkdir -vp ~/.config && cp -v hub ~/.config/hub']
+  - name: "gcr.io/$PROJECT_ID/package-builder"
+    entrypoint: "bash"
+    args: ["-c", "mkdir -vp ~/.config && cp -v hub ~/.config/hub"]
 
   # Publish the package.
-  - name: 'gcr.io/$PROJECT_ID/package-builder'
-    dir: '${_REPOSITORY_NAME}'
-    args: ['bash', './scripts/publish.sh', '${_VERSION}']
+  - name: "gcr.io/$PROJECT_ID/package-builder"
+    dir: "${_REPOSITORY_NAME}"
+    args: ["bash", "./scripts/publish.sh", "${_VERSION}"]
     env:
-      - 'REPOSITORY_ORG=${_REPOSITORY_ORG}'
-      - 'REPOSITORY_NAME=${_REPOSITORY_NAME}'
-      - 'DRY_RUN=${_DRY_RUN}'
+      - "REPOSITORY_ORG=${_REPOSITORY_ORG}"
+      - "REPOSITORY_NAME=${_REPOSITORY_NAME}"
+      - "DRY_RUN=${_DRY_RUN}"
 
 options:
   volumes:
-    - name: 'ssh'
+    - name: "ssh"
       path: /root/.ssh
 
 substitutions:
-  _VERSION: ''
-  _DRY_RUN: ''
-  _KEY_RING: 'npm-publish-keyring'
-  _KEY_NAME: 'publish'
-  _REPOSITORY_ORG: 'firebase'
-  _REPOSITORY_NAME: 'firebase-functions'
+  _VERSION: ""
+  _DRY_RUN: ""
+  _KEY_RING: "npm-publish-keyring"
+  _KEY_NAME: "publish"
+  _REPOSITORY_ORG: "firebase"
+  _REPOSITORY_NAME: "firebase-functions"
diff --git a/spec/common/change.spec.ts b/spec/common/change.spec.ts
index 258fc8463..661188320 100644
--- a/spec/common/change.spec.ts
+++ b/spec/common/change.spec.ts
@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as change from '../../src/common/change';
+import { expect } from "chai";
+import * as change from "../../src/common/change";
 
-describe('Change', () => {
-  describe('applyFieldMask', () => {
+describe("Change", () => {
+  describe("applyFieldMask", () => {
     const after = {
-      foo: 'bar',
+      foo: "bar",
       num: 2,
       obj: {
         a: 1,
@@ -34,47 +34,41 @@ describe('Change', () => {
       },
     };
 
-    it('should handle deleted values', () => {
-      const sparseBefore = { baz: 'qux' };
-      const fieldMask = 'baz';
-      expect(
-        change.applyFieldMask(sparseBefore, after, fieldMask)
-      ).to.deep.equal({
-        foo: 'bar',
+    it("should handle deleted values", () => {
+      const sparseBefore = { baz: "qux" };
+      const fieldMask = "baz";
+      expect(change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({
+        foo: "bar",
         num: 2,
         obj: {
           a: 1,
           b: 2,
         },
-        baz: 'qux',
+        baz: "qux",
       });
     });
 
-    it('should handle created values', () => {
+    it("should handle created values", () => {
       const sparseBefore = {};
-      const fieldMask = 'num,obj.a';
-      expect(
-        change.applyFieldMask(sparseBefore, after, fieldMask)
-      ).to.deep.equal({
-        foo: 'bar',
+      const fieldMask = "num,obj.a";
+      expect(change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({
+        foo: "bar",
         obj: {
           b: 2,
         },
       });
     });
 
-    it('should handle mutated values', () => {
+    it("should handle mutated values", () => {
       const sparseBefore = {
         num: 3,
         obj: {
           a: 3,
         },
       };
-      const fieldMask = 'num,obj.a';
-      expect(
-        change.applyFieldMask(sparseBefore, after, fieldMask)
-      ).to.deep.equal({
-        foo: 'bar',
+      const fieldMask = "num,obj.a";
+      expect(change.applyFieldMask(sparseBefore, after, fieldMask)).to.deep.equal({
+        foo: "bar",
         num: 3,
         obj: {
           a: 3,
@@ -84,36 +78,36 @@ describe('Change', () => {
     });
   });
 
-  describe('fromJSON', () => {
-    it('should create a Change object with a `before` and `after`', () => {
+  describe("fromJSON", () => {
+    it("should create a Change object with a `before` and `after`", () => {
       const created = change.Change.fromJSON<any>({
-        before: { foo: 'bar' },
-        after: { foo: 'faz' },
+        before: { foo: "bar" },
+        after: { foo: "faz" },
       });
       expect(created instanceof change.Change).to.equal(true);
-      expect(created.before).to.deep.equal({ foo: 'bar' });
-      expect(created.after).to.deep.equal({ foo: 'faz' });
+      expect(created.before).to.deep.equal({ foo: "bar" });
+      expect(created.after).to.deep.equal({ foo: "faz" });
     });
 
-    it('should apply the customizer function to `before` and `after`', () => {
+    it("should apply the customizer function to `before` and `after`", () => {
       function customizer<T>(input: any) {
-        input.another = 'value';
+        input.another = "value";
         return input as T;
       }
       const created = change.Change.fromJSON<object>(
         {
-          before: { foo: 'bar' },
-          after: { foo: 'faz' },
+          before: { foo: "bar" },
+          after: { foo: "faz" },
         },
         customizer
       );
       expect(created.before).to.deep.equal({
-        foo: 'bar',
-        another: 'value',
+        foo: "bar",
+        another: "value",
       });
       expect(created.after).to.deep.equal({
-        foo: 'faz',
-        another: 'value',
+        foo: "faz",
+        another: "value",
       });
     });
   });
diff --git a/spec/common/config.spec.ts b/spec/common/config.spec.ts
new file mode 100644
index 000000000..0376c8105
--- /dev/null
+++ b/spec/common/config.spec.ts
@@ -0,0 +1,72 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { expect } from "chai";
+import * as fs from "fs";
+import * as process from "process";
+import Sinon = require("sinon");
+
+import { firebaseConfig, resetCache } from "../../src/common/config";
+
+describe("firebaseConfig()", () => {
+  let readFileSync: Sinon.SinonStub;
+  let cwdStub: Sinon.SinonStub;
+
+  before(() => {
+    readFileSync = Sinon.stub(fs, "readFileSync");
+    readFileSync.throws("Unexpected call");
+    cwdStub = Sinon.stub(process, "cwd");
+    cwdStub.returns("/srv");
+  });
+
+  after(() => {
+    Sinon.verifyAndRestore();
+  });
+
+  afterEach(() => {
+    resetCache();
+
+    delete process.env.FIREBASE_CONFIG;
+    delete process.env.K_CONFIGURATION;
+  });
+
+  it("loads Firebase configs from FIREBASE_CONFIG env variable", () => {
+    process.env.FIREBASE_CONFIG = JSON.stringify({
+      databaseURL: "foo@firebaseio.com",
+    });
+    expect(firebaseConfig()).to.have.property("databaseURL", "foo@firebaseio.com");
+  });
+
+  it("loads Firebase configs from FIREBASE_CONFIG env variable pointing to a file", () => {
+    const oldEnv = process.env;
+    (process as any).env = {
+      ...oldEnv,
+      FIREBASE_CONFIG: ".firebaseconfig.json",
+    };
+    try {
+      readFileSync.returns(Buffer.from('{"databaseURL": "foo@firebaseio.com"}'));
+      expect(firebaseConfig()).to.have.property("databaseURL", "foo@firebaseio.com");
+    } finally {
+      (process as any).env = oldEnv;
+    }
+  });
+});
diff --git a/spec/common/encoding.spec.ts b/spec/common/encoding.spec.ts
index 388a6681c..5e73b06cd 100644
--- a/spec/common/encoding.spec.ts
+++ b/spec/common/encoding.spec.ts
@@ -1,48 +1,48 @@
-import { expect } from 'chai';
-import { convertInvoker } from '../../src/common/encoding';
+import { expect } from "chai";
+import { convertInvoker } from "../../src/common/encoding";
 
-describe('convertInvoker', () => {
-  it('should raise an error on empty array', () => {
+describe("convertInvoker", () => {
+  it("should raise an error on empty array", () => {
     expect(() => convertInvoker([])).to.throw;
   });
 
-  it('should raise an error on empty string', () => {
-    expect(() => convertInvoker('')).to.throw;
+  it("should raise an error on empty string", () => {
+    expect(() => convertInvoker("")).to.throw;
   });
 
-  it('should raise an error on empty string with service accounts', () => {
-    expect(() => convertInvoker(['service-account@', ''])).to.throw;
+  it("should raise an error on empty string with service accounts", () => {
+    expect(() => convertInvoker(["service-account@", ""])).to.throw;
   });
 
-  it('should raise an error on mixing public and service accounts', () => {
-    expect(() => convertInvoker(['public', 'service-account@'])).to.throw;
+  it("should raise an error on mixing public and service accounts", () => {
+    expect(() => convertInvoker(["public", "service-account@"])).to.throw;
   });
 
-  it('should raise an error on mixing private and service accounts', () => {
-    expect(() => convertInvoker(['private', 'service-account@'])).to.throw;
+  it("should raise an error on mixing private and service accounts", () => {
+    expect(() => convertInvoker(["private", "service-account@"])).to.throw;
   });
 
-  it('should return the correct public invoker', () => {
-    const invoker = convertInvoker('public');
+  it("should return the correct public invoker", () => {
+    const invoker = convertInvoker("public");
 
-    expect(invoker).to.deep.equal(['public']);
+    expect(invoker).to.deep.equal(["public"]);
   });
 
-  it('should return the correct private invoker', () => {
-    const invoker = convertInvoker('private');
+  it("should return the correct private invoker", () => {
+    const invoker = convertInvoker("private");
 
-    expect(invoker).to.deep.equal(['private']);
+    expect(invoker).to.deep.equal(["private"]);
   });
 
-  it('should return the correct scalar invoker', () => {
-    const invoker = convertInvoker('service-account@');
+  it("should return the correct scalar invoker", () => {
+    const invoker = convertInvoker("service-account@");
 
-    expect(invoker).to.deep.equal(['service-account@']);
+    expect(invoker).to.deep.equal(["service-account@"]);
   });
 
-  it('should return the correct array invoker', () => {
-    const invoker = convertInvoker(['service-account1@', 'service-account2@']);
+  it("should return the correct array invoker", () => {
+    const invoker = convertInvoker(["service-account1@", "service-account2@"]);
 
-    expect(invoker).to.deep.equal(['service-account1@', 'service-account2@']);
+    expect(invoker).to.deep.equal(["service-account1@", "service-account2@"]);
   });
 });
diff --git a/spec/common/metaprogramming.ts b/spec/common/metaprogramming.ts
new file mode 100644
index 000000000..11909ede8
--- /dev/null
+++ b/spec/common/metaprogramming.ts
@@ -0,0 +1,25 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+// This method will fail to compile if value is not of the explicit parameter type.
+/* eslint-disable @typescript-eslint/no-unused-vars,@typescript-eslint/no-empty-function */
+export function expectType<Type>(value: Type) {}
+export function expectNever<Type extends never>() {}
diff --git a/spec/common/options.ts b/spec/common/options.ts
new file mode 100644
index 000000000..1e49863c4
--- /dev/null
+++ b/spec/common/options.ts
@@ -0,0 +1,36 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ignoreUnusedWarning OR OTHER DEALINGS IN THE
+// SOFTWARE.
+import { ResettableKeys, ResetValue } from "../../src/common/options";
+import { expectNever, expectType } from "./metaprogramming";
+
+describe("ResettableKeys", () => {
+  it("should pick out keys with a type that includes ResetValue", () => {
+    type A = { a: number; b: ResetValue; c: number | boolean | ResetValue };
+    expectType<keyof ResettableKeys<A>>("b");
+    expectType<keyof ResettableKeys<A>>("c");
+  });
+
+  it("should return an empty type if no keys are resettable", () => {
+    type A = { a: number };
+    expectNever<keyof ResettableKeys<A>>();
+  });
+});
diff --git a/spec/common/params.spec.ts b/spec/common/params.spec.ts
new file mode 100644
index 000000000..595a5758f
--- /dev/null
+++ b/spec/common/params.spec.ts
@@ -0,0 +1,109 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE ignoreUnusedWarning OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { Extract, ParamsOf, Split } from "../../src/common/params";
+import { expectNever, expectType } from "./metaprogramming";
+
+describe("Params namespace", () => {
+  describe("Split", () => {
+    // Note the subtle difference in the first two cases:
+    // if passed a string (instead of a string literal) then split returns a
+    // string[], which means "any number of elements as long as they are a string"
+    // but if passed a literal string "" then split returns [] which means "a
+    // tuple of zero elements".
+
+    it("handles generic strings", () => {
+      expectType<Split<string, "/">>([] as string[]);
+    });
+
+    it("handles empty strings", () => {
+      expectType<Split<"", "/">>([]);
+    });
+
+    it("handles just a slash", () => {
+      expectType<Split<"/", "/">>([]);
+    });
+
+    it("handles literal strings with one component", () => {
+      expectType<Split<"a", "/">>(["a"]);
+    });
+
+    it("handles literal strings with more than one component", () => {
+      expectType<Split<"a/b/c", "/">>(["a", "b", "c"]);
+    });
+
+    it("strips leading slashes", () => {
+      expectType<Split<"/a/b/c", "/">>(["a", "b", "c"]);
+    });
+  });
+
+  describe("Extract", () => {
+    it("extracts nothing from strings without params", () => {
+      expectNever<Extract<"uid">>();
+    });
+
+    it("extracts {segment} captures", () => {
+      expectType<Extract<"{uid}">>("uid");
+    });
+
+    it("extracts {segment=*} captures", () => {
+      expectType<Extract<"{uid=*}">>("uid");
+    });
+
+    it("extracts {segment=**} captures", () => {
+      expectType<Extract<"{uid=**}">>("uid");
+    });
+  });
+
+  describe("ParamsOf", () => {
+    it("falls back to Record<string, string> without better type info", () => {
+      expectType<ParamsOf<string>>({} as Record<string, string>);
+    });
+
+    it("is the empty object when there are no params", () => {
+      expectType<ParamsOf<string>>({} as Record<string, never>);
+    });
+
+    it("extracts a single param", () => {
+      expectType<ParamsOf<"ignoreUnusedWarningrs/{uid}">>({
+        uid: "uid",
+      } as const);
+    });
+
+    it("extracts multiple params", () => {
+      expectType<ParamsOf<"ignoreUnusedWarningrs/{uid}/logs/{log=**}">>({
+        uid: "hello",
+        log: "world",
+      } as const);
+    });
+
+    it("extracts strings with params interpolated", () => {
+      // NOTE: be wary of this test. Hover over the types to see what they're
+      // parsing as. When doing TDD this test surprisingly passed. That's
+      // because ParamsOf was returning the empty interface because it did
+      // not special case for Record<string, never>. This meant that any input
+      // would pass the test. Fixing this issue in the test suite is as copmlex
+      // as fixing the bug to begin with and would probably share implementations.
+      expectType<ParamsOf<`${string}/{uid}`>>({ uid: "uid" });
+    });
+  });
+});
diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts
index a87aa844d..c61917bfb 100644
--- a/spec/common/providers/https.spec.ts
+++ b/spec/common/providers/https.spec.ts
@@ -1,11 +1,12 @@
-import { expect } from 'chai';
-import * as firebase from 'firebase-admin';
-import * as sinon from 'sinon';
-
-import { apps as appsNamespace } from '../../../src/apps';
-import * as debug from '../../../src/common/debug';
-import * as https from '../../../src/common/providers/https';
-import * as mocks from '../../fixtures/credential/key.json';
+import { expect } from "chai";
+import { App, initializeApp } from "firebase-admin/app";
+import * as sinon from "sinon";
+import * as nock from "nock";
+
+import { getApp, setApp } from "../../../src/common/app";
+import * as debug from "../../../src/common/debug";
+import * as https from "../../../src/common/providers/https";
+import * as mocks from "../../fixtures/credential/key.json";
 import {
   expectedResponseHeaders,
   generateAppCheckToken,
@@ -15,13 +16,8 @@ import {
   mockFetchAppCheckPublicJwks,
   mockFetchPublicKeys,
   mockRequest,
-} from '../../fixtures/mockrequest';
-import {
-  checkAppCheckContext,
-  checkAuthContext,
-  runHandler,
-  RunHandlerResult,
-} from '../../helper';
+} from "../../fixtures/mockrequest";
+import { checkAppCheckContext, checkAuthContext, runHandler, RunHandlerResult } from "../../helper";
 
 /**
  * A CallTest is a specification for a test of a callable function that
@@ -49,7 +45,7 @@ interface CallTest {
 // Runs a CallTest test.
 async function runCallableTest(test: CallTest): Promise<any> {
   const opts = {
-    cors: { origin: true, methods: 'POST' },
+    cors: { origin: true, methods: "POST" },
     ...test.callableOption,
   };
   const callableFunctionV1 = https.onCallHandler(opts, (data, context) => {
@@ -75,55 +71,57 @@ async function runCallableTest(test: CallTest): Promise<any> {
   expect(responseV2.status).to.equal(test.expectedHttpResponse.status);
 }
 
-describe('onCallHandler', () => {
-  let app: firebase.app.App;
+describe("onCallHandler", () => {
+  let app: App;
 
   before(() => {
     const credential = {
       getAccessToken: () => {
         return Promise.resolve({
           expires_in: 1000,
-          access_token: 'fake',
+          access_token: "fake",
         });
       },
       getCertificate: () => {
         return {
-          projectId: 'aProjectId',
+          projectId: "aProjectId",
         };
       },
     };
-    app = firebase.initializeApp({
-      projectId: 'aProjectId',
-      credential,
-    });
-    Object.defineProperty(appsNamespace(), 'admin', { get: () => app });
+    app = initializeApp(
+      {
+        projectId: "aProjectId",
+        credential,
+      },
+      "test-app"
+    );
+    setApp(app);
   });
 
   after(() => {
-    app.delete();
-    delete appsNamespace.singleton;
+    setApp(undefined);
   });
 
-  it('should handle success', () => {
+  it("should handle success", () => {
     return runCallableTest({
-      httpRequest: mockRequest({ foo: 'bar' }),
-      expectedData: { foo: 'bar' },
-      callableFunction: (data, context) => ({ baz: 'qux' }),
-      callableFunction2: (request) => ({ baz: 'qux' }),
+      httpRequest: mockRequest({ foo: "bar" }),
+      expectedData: { foo: "bar" },
+      callableFunction: () => ({ baz: "qux" }),
+      callableFunction2: () => ({ baz: "qux" }),
       expectedHttpResponse: {
         status: 200,
         headers: expectedResponseHeaders,
-        body: { result: { baz: 'qux' } },
+        body: { result: { baz: "qux" } },
       },
     });
   });
 
-  it('should handle null data and return', () => {
+  it("should handle null data and return", () => {
     return runCallableTest({
       httpRequest: mockRequest(null),
       expectedData: null,
-      callableFunction: (data, context) => null,
-      callableFunction2: (request) => null,
+      callableFunction: () => null,
+      callableFunction2: () => null,
       expectedHttpResponse: {
         status: 200,
         headers: expectedResponseHeaders,
@@ -132,14 +130,14 @@ describe('onCallHandler', () => {
     });
   });
 
-  it('should handle void return', () => {
+  it("should handle void return", () => {
     return runCallableTest({
       httpRequest: mockRequest(null),
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         return;
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         return;
       },
       expectedHttpResponse: {
@@ -150,36 +148,36 @@ describe('onCallHandler', () => {
     });
   });
 
-  it('should reject bad method', () => {
+  it("should reject bad method", () => {
     const req = mockRequest(null);
-    req.method = 'GET';
+    req.method = "GET";
     return runCallableTest({
       httpRequest: req,
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         return;
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         return;
       },
       expectedHttpResponse: {
         status: 400,
         headers: expectedResponseHeaders,
         body: {
-          error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' },
+          error: { status: "INVALID_ARGUMENT", message: "Bad Request" },
         },
       },
     });
   });
 
-  it('should ignore charset', () => {
+  it("should ignore charset", () => {
     return runCallableTest({
-      httpRequest: mockRequest(null, 'application/json; charset=utf-8'),
+      httpRequest: mockRequest(null, "application/json; charset=utf-8"),
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         return;
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         return;
       },
       expectedHttpResponse: {
@@ -190,303 +188,383 @@ describe('onCallHandler', () => {
     });
   });
 
-  it('should reject bad content type', () => {
+  it("should reject bad content type", () => {
     return runCallableTest({
-      httpRequest: mockRequest(null, 'text/plain'),
+      httpRequest: mockRequest(null, "text/plain"),
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         return;
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         return;
       },
       expectedHttpResponse: {
         status: 400,
         headers: expectedResponseHeaders,
         body: {
-          error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' },
+          error: { status: "INVALID_ARGUMENT", message: "Bad Request" },
         },
       },
     });
   });
 
-  it('should reject extra body fields', () => {
+  it("should reject extra body fields", () => {
     const req = mockRequest(null);
-    req.body.extra = 'bad';
+    req.body.extra = "bad";
     return runCallableTest({
       httpRequest: req,
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         return;
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         return;
       },
       expectedHttpResponse: {
         status: 400,
         headers: expectedResponseHeaders,
         body: {
-          error: { status: 'INVALID_ARGUMENT', message: 'Bad Request' },
+          error: { status: "INVALID_ARGUMENT", message: "Bad Request" },
         },
       },
     });
   });
 
-  it('should handle unhandled error', () => {
+  it("should handle unhandled error", () => {
     return runCallableTest({
       httpRequest: mockRequest(null),
       expectedData: null,
-      callableFunction: (data, context) => {
+      callableFunction: () => {
         throw new Error(`ceci n'est pas une error`);
       },
-      callableFunction2: (request) => {
+      callableFunction2: () => {
         throw new Error(`cece n'est pas une error`);
       },
       expectedHttpResponse: {
         status: 500,
         headers: expectedResponseHeaders,
-        body: { error: { status: 'INTERNAL', message: 'INTERNAL' } },
+        body: { error: { status: "INTERNAL", message: "INTERNAL" } },
       },
     });
   });
 
-  it('should handle unknown error status', () => {
+  it("should handle unknown error status", () => {
     return runCallableTest({
       httpRequest: mockRequest(null),
       expectedData: null,
-      callableFunction: (data, context) => {
-        throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope');
+      callableFunction: () => {
+        throw new https.HttpsError("THIS_IS_NOT_VALID" as any, "nope");
       },
-      callableFunction2: (request) => {
-        throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope');
+      callableFunction2: () => {
+        throw new https.HttpsError("THIS_IS_NOT_VALID" as any, "nope");
       },
       expectedHttpResponse: {
         status: 500,
         headers: expectedResponseHeaders,
-        body: { error: { status: 'INTERNAL', message: 'INTERNAL' } },
+        body: { error: { status: "INTERNAL", message: "INTERNAL" } },
       },
     });
   });
 
-  it('should handle well-formed error', () => {
+  it("should handle well-formed error", () => {
     return runCallableTest({
       httpRequest: mockRequest(null),
       expectedData: null,
-      callableFunction: (data, context) => {
-        throw new https.HttpsError('not-found', 'i am error');
+      callableFunction: () => {
+        throw new https.HttpsError("not-found", "i am error");
       },
-      callableFunction2: (request) => {
-        throw new https.HttpsError('not-found', 'i am error');
+      callableFunction2: () => {
+        throw new https.HttpsError("not-found", "i am error");
       },
       expectedHttpResponse: {
         status: 404,
         headers: expectedResponseHeaders,
-        body: { error: { status: 'NOT_FOUND', message: 'i am error' } },
+        body: { error: { status: "NOT_FOUND", message: "i am error" } },
       },
     });
   });
 
-  it('should handle auth', async () => {
-    const mock = mockFetchPublicKeys();
-    const projectId = appsNamespace().admin.options.projectId;
-    const idToken = generateIdToken(projectId);
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', {
-        authorization: 'Bearer ' + idToken,
-      }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        checkAuthContext(context, projectId, mocks.user_id);
-        return null;
-      },
-      callableFunction2: (request) => {
-        checkAuthContext(request, projectId, mocks.user_id);
-        return null;
-      },
-      expectedHttpResponse: {
-        status: 200,
-        headers: expectedResponseHeaders,
-        body: { result: null },
-      },
+  describe("auth", () => {
+    let mock: nock.Scope;
+
+    before(() => {
+      mock = mockFetchPublicKeys();
     });
-    mock.done();
-  });
 
-  it('should reject bad auth', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
-    const idToken = generateUnsignedIdToken(projectId);
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', {
-        authorization: 'Bearer ' + idToken,
-      }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        return;
-      },
-      callableFunction2: (request) => {
-        return;
-      },
-      expectedHttpResponse: {
-        status: 401,
-        headers: expectedResponseHeaders,
-        body: {
-          error: {
-            status: 'UNAUTHENTICATED',
-            message: 'Unauthenticated',
-          },
+    after(() => {
+      mock.done();
+    });
+
+    it("should handle auth", async () => {
+      const projectId = getApp().options.projectId;
+      const idToken = generateIdToken(projectId);
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          authorization: "Bearer " + idToken,
+        }),
+        expectedData: null,
+        callableFunction: (data, context) => {
+          checkAuthContext(context, projectId, mocks.user_id);
+          return null;
         },
-      },
+        callableFunction2: (request) => {
+          checkAuthContext(request, projectId, mocks.user_id);
+          return null;
+        },
+        expectedHttpResponse: {
+          status: 200,
+          headers: expectedResponseHeaders,
+          body: { result: null },
+        },
+      });
     });
-  });
 
-  it('should handle AppCheck token', async () => {
-    const mock = mockFetchAppCheckPublicJwks();
-    const projectId = appsNamespace().admin.options.projectId;
-    const appId = '123:web:abc';
-    const appCheckToken = generateAppCheckToken(projectId, appId);
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', { appCheckToken }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        checkAppCheckContext(context, projectId, appId);
-        return null;
-      },
-      callableFunction2: (request) => {
-        checkAppCheckContext(request, projectId, appId);
-        return null;
-      },
-      expectedHttpResponse: {
-        status: 200,
-        headers: expectedResponseHeaders,
-        body: { result: null },
-      },
+    it("should handle auth - case insensitive", async () => {
+      const projectId = getApp().options.projectId;
+      const idToken = generateIdToken(projectId);
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          authorization: "bearer " + idToken,
+        }),
+        expectedData: null,
+        callableFunction: (data, context) => {
+          checkAuthContext(context, projectId, mocks.user_id);
+          return null;
+        },
+        callableFunction2: (request) => {
+          checkAuthContext(request, projectId, mocks.user_id);
+          return null;
+        },
+        expectedHttpResponse: {
+          status: 200,
+          headers: expectedResponseHeaders,
+          body: { result: null },
+        },
+      });
     });
-    expect(mock.isDone()).to.be.true;
-  });
 
-  it('should reject bad AppCheck token', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
-    const appId = '123:web:abc';
-    const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', { appCheckToken }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        return;
-      },
-      callableFunction2: (request) => {
-        return;
-      },
-      expectedHttpResponse: {
-        status: 401,
-        headers: expectedResponseHeaders,
-        body: {
-          error: {
-            status: 'UNAUTHENTICATED',
-            message: 'Unauthenticated',
+    it("should reject auth with incorrect authorization header", async () => {
+      const projectId = getApp().options.projectId;
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          authorization: "Beaver heyyall",
+        }),
+        expectedData: null,
+        callableFunction: (data, context) => {
+          checkAuthContext(context, projectId, mocks.user_id);
+          return null;
+        },
+        callableFunction2: (request) => {
+          checkAuthContext(request, projectId, mocks.user_id);
+          return null;
+        },
+        expectedHttpResponse: {
+          status: 401,
+          headers: expectedResponseHeaders,
+          body: {
+            error: {
+              status: "UNAUTHENTICATED",
+              message: "Unauthenticated",
+            },
           },
         },
-      },
+      });
     });
-  });
 
-  it('should handle bad AppCheck token with callable option', async () => {
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', {
-        appCheckToken: 'FAKE',
-      }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        return;
-      },
-      callableFunction2: (request) => {
-        return;
-      },
-      callableOption: {
-        cors: { origin: true, methods: 'POST' },
-        allowInvalidAppCheckToken: true,
-      },
-      expectedHttpResponse: {
-        status: 200,
-        headers: expectedResponseHeaders,
-        body: { result: null },
-      },
+    it("should reject bad auth with bad signature", async () => {
+      const projectId = getApp().options.projectId;
+      const idToken = generateUnsignedIdToken(projectId);
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          authorization: "Bearer " + idToken,
+        }),
+        expectedData: null,
+        callableFunction: () => {
+          return;
+        },
+        callableFunction2: () => {
+          return;
+        },
+        expectedHttpResponse: {
+          status: 401,
+          headers: expectedResponseHeaders,
+          body: {
+            error: {
+              status: "UNAUTHENTICATED",
+              message: "Unauthenticated",
+            },
+          },
+        },
+      });
     });
   });
 
-  it('should handle instance id', async () => {
-    await runCallableTest({
-      httpRequest: mockRequest(null, 'application/json', {
-        instanceIdToken: 'iid-token',
-      }),
-      expectedData: null,
-      callableFunction: (data, context) => {
-        expect(context.auth).to.be.undefined;
-        expect(context.instanceIdToken).to.equal('iid-token');
-        return null;
-      },
-      callableFunction2: (request) => {
-        expect(request.auth).to.be.undefined;
-        expect(request.instanceIdToken).to.equal('iid-token');
-        return null;
-      },
-      expectedHttpResponse: {
-        status: 200,
-        headers: expectedResponseHeaders,
-        body: { result: null },
-      },
+  describe("AppCheck", () => {
+    let mock: nock.Scope;
+
+    before(() => {
+      mock = mockFetchAppCheckPublicJwks();
     });
-  });
 
-  it('should expose raw request', async () => {
-    const mockReq = mockRequest(null, 'application/json', {});
-    await runCallableTest({
-      httpRequest: mockReq,
-      expectedData: null,
-      callableFunction: (data, context) => {
-        expect(context.rawRequest).to.not.be.undefined;
-        expect(context.rawRequest).to.equal(mockReq);
-        return null;
-      },
-      callableFunction2: (request) => {
-        expect(request.rawRequest).to.not.be.undefined;
-        expect(request.rawRequest).to.equal(mockReq);
-        return null;
-      },
-      expectedHttpResponse: {
-        status: 200,
-        headers: expectedResponseHeaders,
-        body: { result: null },
-      },
+    after(() => {
+      mock.done();
     });
-  });
 
-  describe('skip token verification debug mode support', () => {
-    before(() => {
-      sinon
-        .stub(debug, 'isDebugFeatureEnabled')
-        .withArgs('skipTokenVerification')
-        .returns(true);
+    it("should handle AppCheck token", async () => {
+      const projectId = getApp().options.projectId;
+      const appId = "123:web:abc";
+      const appCheckToken = generateAppCheckToken(projectId, appId);
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", { appCheckToken }),
+        expectedData: null,
+        callableOption: {
+          cors: { origin: true, methods: "POST" },
+          enforceAppCheck: true,
+        },
+        callableFunction: (data, context) => {
+          checkAppCheckContext(context, projectId, appId);
+          return null;
+        },
+        callableFunction2: (request) => {
+          checkAppCheckContext(request, projectId, appId);
+          return null;
+        },
+        expectedHttpResponse: {
+          status: 200,
+          headers: expectedResponseHeaders,
+          body: { result: null },
+        },
+      });
     });
 
-    after(() => {
-      sinon.verifyAndRestore();
+    it("should reject bad AppCheck token", async () => {
+      const projectId = getApp().options.projectId;
+      const appId = "123:web:abc";
+      const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", { appCheckToken }),
+        expectedData: null,
+        callableOption: {
+          cors: { origin: true, methods: "POST" },
+          enforceAppCheck: true,
+        },
+        callableFunction: () => {
+          return;
+        },
+        callableFunction2: () => {
+          return;
+        },
+        expectedHttpResponse: {
+          status: 401,
+          headers: expectedResponseHeaders,
+          body: {
+            error: {
+              status: "UNAUTHENTICATED",
+              message: "Unauthenticated",
+            },
+          },
+        },
+      });
     });
 
-    it('should skip auth token verification', async () => {
-      const projectId = appsNamespace().admin.options.projectId;
-      const idToken = generateUnsignedIdToken(projectId);
+    it("should handle bad AppCheck token with enforcement disabled", async () => {
       await runCallableTest({
-        httpRequest: mockRequest(null, 'application/json', {
-          authorization: 'Bearer ' + idToken,
+        httpRequest: mockRequest(null, "application/json", {
+          appCheckToken: "FAKE",
         }),
         expectedData: null,
+        callableOption: {
+          cors: { origin: true, methods: "POST" },
+          enforceAppCheck: false,
+        },
         callableFunction: (data, context) => {
-          checkAuthContext(context, projectId, mocks.user_id);
+          expect(context.app).to.be.undefined;
+          return;
+        },
+        callableFunction2: (request) => {
+          expect(request.app).to.be.undefined;
+          return;
+        },
+        expectedHttpResponse: {
+          status: 200,
+          headers: expectedResponseHeaders,
+          body: { result: null },
+        },
+      });
+    });
+
+    it("should handle bad AppCheck token with enforcement enabled", async () => {
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          appCheckToken: "FAKE",
+        }),
+        expectedData: null,
+        callableOption: {
+          cors: { origin: true, methods: "POST" },
+          enforceAppCheck: true,
+        },
+        callableFunction: () => {
+          return;
+        },
+        callableFunction2: () => {
+          return;
+        },
+        expectedHttpResponse: {
+          status: 401,
+          headers: expectedResponseHeaders,
+          body: {
+            error: {
+              message: "Unauthenticated",
+              status: "UNAUTHENTICATED",
+            },
+          },
+        },
+      });
+    });
+
+    it("should handle no AppCheck token with enforcement enabled", async () => {
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          appCheckToken: "MISSING",
+        }),
+        expectedData: null,
+        callableFunction: () => {
+          return;
+        },
+        callableFunction2: () => {
+          return;
+        },
+        callableOption: {
+          cors: { origin: true, methods: "POST" },
+          enforceAppCheck: true,
+        },
+        expectedHttpResponse: {
+          status: 401,
+          headers: expectedResponseHeaders,
+          body: {
+            error: {
+              message: "Unauthenticated",
+              status: "UNAUTHENTICATED",
+            },
+          },
+        },
+      });
+    });
+
+    it("should handle instance id", async () => {
+      await runCallableTest({
+        httpRequest: mockRequest(null, "application/json", {
+          instanceIdToken: "iid-token",
+        }),
+        expectedData: null,
+        callableFunction: (data, context) => {
+          expect(context.auth).to.be.undefined;
+          expect(context.instanceIdToken).to.equal("iid-token");
           return null;
         },
         callableFunction2: (request) => {
-          checkAuthContext(request, projectId, mocks.user_id);
+          expect(request.auth).to.be.undefined;
+          expect(request.instanceIdToken).to.equal("iid-token");
           return null;
         },
         expectedHttpResponse: {
@@ -497,19 +575,19 @@ describe('onCallHandler', () => {
       });
     });
 
-    it('should skip app check token verification', async () => {
-      const projectId = appsNamespace().admin.options.projectId;
-      const appId = '123:web:abc';
-      const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
+    it("should expose raw request", async () => {
+      const mockReq = mockRequest(null, "application/json", {});
       await runCallableTest({
-        httpRequest: mockRequest(null, 'application/json', { appCheckToken }),
+        httpRequest: mockReq,
         expectedData: null,
         callableFunction: (data, context) => {
-          checkAppCheckContext(context, projectId, appId);
+          expect(context.rawRequest).to.not.be.undefined;
+          expect(context.rawRequest).to.equal(mockReq);
           return null;
         },
         callableFunction2: (request) => {
-          checkAppCheckContext(request, projectId, appId);
+          expect(request.rawRequest).to.not.be.undefined;
+          expect(request.rawRequest).to.equal(mockReq);
           return null;
         },
         expectedHttpResponse: {
@@ -519,160 +597,213 @@ describe('onCallHandler', () => {
         },
       });
     });
+
+    describe("skip token verification debug mode support", () => {
+      before(() => {
+        sinon.stub(debug, "isDebugFeatureEnabled").withArgs("skipTokenVerification").returns(true);
+      });
+
+      after(() => {
+        sinon.verifyAndRestore();
+      });
+
+      it("should skip auth token verification", async () => {
+        const projectId = getApp().options.projectId;
+        const idToken = generateUnsignedIdToken(projectId);
+        await runCallableTest({
+          httpRequest: mockRequest(null, "application/json", {
+            authorization: "Bearer " + idToken,
+          }),
+          expectedData: null,
+          callableFunction: (data, context) => {
+            checkAuthContext(context, projectId, mocks.user_id);
+            return null;
+          },
+          callableFunction2: (request) => {
+            checkAuthContext(request, projectId, mocks.user_id);
+            return null;
+          },
+          expectedHttpResponse: {
+            status: 200,
+            headers: expectedResponseHeaders,
+            body: { result: null },
+          },
+        });
+      });
+
+      it("should skip app check token verification", async () => {
+        const projectId = getApp().options.projectId;
+        const appId = "123:web:abc";
+        const appCheckToken = generateUnsignedAppCheckToken(projectId, appId);
+        await runCallableTest({
+          httpRequest: mockRequest(null, "application/json", { appCheckToken }),
+          expectedData: null,
+          callableFunction: (data, context) => {
+            checkAppCheckContext(context, projectId, appId);
+            return null;
+          },
+          callableFunction2: (request) => {
+            checkAppCheckContext(request, projectId, appId);
+            return null;
+          },
+          expectedHttpResponse: {
+            status: 200,
+            headers: expectedResponseHeaders,
+            body: { result: null },
+          },
+        });
+      });
+    });
   });
 });
 
-describe('encoding/decoding', () => {
-  it('encodes null', () => {
+describe("encoding/decoding", () => {
+  it("encodes null", () => {
     expect(https.encode(null)).to.be.null;
     expect(https.encode(undefined)).to.be.null;
   });
 
-  it('encodes int', () => {
+  it("encodes int", () => {
     expect(https.encode(1)).to.equal(1);
     // Number isn't allowed in our own codebase, but we need to test it, in case
     // a user passes one in. There's no reason not to support it, and we don't
     // want to unintentionally encode them as {}.
     // tslint:disable-next-line
-    expect(https.encode(new Number(1))).to.equal(1);
+    expect(https.encode(Number(1))).to.equal(1);
   });
 
-  it('decodes int', () => {
+  it("decodes int", () => {
     expect(https.decode(1)).to.equal(1);
   });
 
-  it('encodes long', () => {
+  it("encodes long", () => {
     expect(https.encode(-9223372036854775000)).to.equal(-9223372036854775000);
   });
 
-  it('decodes long', () => {
+  it("decodes long", () => {
     expect(
       https.decode({
-        '@type': 'type.googleapis.com/google.protobuf.Int64Value',
-        value: '-9223372036854775000',
+        "@type": "type.googleapis.com/google.protobuf.Int64Value",
+        value: "-9223372036854775000",
       })
     ).to.equal(-9223372036854775000);
   });
 
-  it('encodes unsigned long', () => {
+  it("encodes unsigned long", () => {
     expect(https.encode(9223372036854800000)).to.equal(9223372036854800000);
   });
 
-  it('decodes unsigned long', () => {
+  it("decodes unsigned long", () => {
     expect(
       https.decode({
-        '@type': 'type.googleapis.com/google.protobuf.UInt64Value',
-        value: '9223372036854800000',
+        "@type": "type.googleapis.com/google.protobuf.UInt64Value",
+        value: "9223372036854800000",
       })
     ).to.equal(9223372036854800000);
   });
 
-  it('encodes double', () => {
+  it("encodes double", () => {
     expect(https.encode(1.2)).to.equal(1.2);
   });
-  it('decodes double', () => {
+  it("decodes double", () => {
     expect(https.decode(1.2)).to.equal(1.2);
   });
 
-  it('encodes string', () => {
-    expect(https.encode('hello')).to.equal('hello');
+  it("encodes string", () => {
+    expect(https.encode("hello")).to.equal("hello");
   });
 
-  it('decodes string', () => {
-    expect(https.decode('hello')).to.equal('hello');
+  it("decodes string", () => {
+    expect(https.decode("hello")).to.equal("hello");
   });
 
-  it('encodes array', () => {
+  it("encodes array", () => {
     // TODO(klimt): Make this test more interesting once there's some type
     // that needs encoding that can be created from JavaScript.
-    expect(https.encode([1, '2', [3, 4]])).to.deep.equal([1, '2', [3, 4]]);
+    expect(https.encode([1, "2", [3, 4]])).to.deep.equal([1, "2", [3, 4]]);
   });
 
-  it('decodes array', () => {
+  it("decodes array", () => {
     expect(
       https.decode([
         1,
-        '2',
+        "2",
         [
           3,
           {
-            value: '1099511627776',
-            '@type': 'type.googleapis.com/google.protobuf.Int64Value',
+            value: "1099511627776",
+            "@type": "type.googleapis.com/google.protobuf.Int64Value",
           },
         ],
       ])
-    ).to.deep.equal([1, '2', [3, 1099511627776]]);
+    ).to.deep.equal([1, "2", [3, 1099511627776]]);
   });
 
-  it('encodes object', () => {
+  it("encodes object", () => {
     // TODO(klimt): Make this test more interesting once there's some type
     // that needs encoding that can be created from JavaScript.
     expect(
       https.encode({
         foo: 1,
-        bar: 'hello',
+        bar: "hello",
         baz: [1, 2, 3],
       })
     ).to.deep.equal({
       foo: 1,
-      bar: 'hello',
+      bar: "hello",
       baz: [1, 2, 3],
     });
   });
 
-  it('decodes object', () => {
+  it("decodes object", () => {
     expect(
       https.decode({
         foo: 1,
-        bar: 'hello',
+        bar: "hello",
         baz: [
           1,
           2,
           {
-            value: '1099511627776',
-            '@type': 'type.googleapis.com/google.protobuf.Int64Value',
+            value: "1099511627776",
+            "@type": "type.googleapis.com/google.protobuf.Int64Value",
           },
         ],
       })
     ).to.deep.equal({
       foo: 1,
-      bar: 'hello',
+      bar: "hello",
       baz: [1, 2, 1099511627776],
     });
   });
 
-  it('encodes function as an empty object', () => {
-    expect(https.encode(() => 'foo')).to.deep.equal({});
+  it("encodes function as an empty object", () => {
+    expect(https.encode(() => "foo")).to.deep.equal({});
   });
 });
 
-describe('decode tokens', () => {
-  const projectId = 'myproject';
-  const appId = '123:web:abc';
+describe("decode tokens", () => {
+  const projectId = "myproject";
+  const appId = "123:web:abc";
 
-  it('decodes valid Auth ID Token', () => {
+  it("decodes valid Auth ID Token", () => {
     const idToken = https.unsafeDecodeIdToken(generateIdToken(projectId));
     expect(idToken.uid).to.equal(mocks.user_id);
     expect(idToken.sub).to.equal(mocks.user_id);
   });
 
-  it('decodes invalid Auth ID Token', () => {
-    const idToken = https.unsafeDecodeIdToken(
-      generateUnsignedIdToken(projectId)
-    );
+  it("decodes invalid Auth ID Token", () => {
+    const idToken = https.unsafeDecodeIdToken(generateUnsignedIdToken(projectId));
     expect(idToken.uid).to.equal(mocks.user_id);
     expect(idToken.sub).to.equal(mocks.user_id);
   });
 
-  it('decodes valid App Check Token', () => {
-    const idToken = https.unsafeDecodeAppCheckToken(
-      generateAppCheckToken(projectId, appId)
-    );
+  it("decodes valid App Check Token", () => {
+    const idToken = https.unsafeDecodeAppCheckToken(generateAppCheckToken(projectId, appId));
     expect(idToken.app_id).to.equal(appId);
     expect(idToken.sub).to.equal(appId);
   });
 
-  it('decodes invalid App Check Token', () => {
+  it("decodes invalid App Check Token", () => {
     const idToken = https.unsafeDecodeAppCheckToken(
       generateUnsignedAppCheckToken(projectId, appId)
     );
diff --git a/spec/common/providers/identity.spec.ts b/spec/common/providers/identity.spec.ts
index 2b2ea71e9..308845172 100644
--- a/spec/common/providers/identity.spec.ts
+++ b/spec/common/providers/identity.spec.ts
@@ -20,19 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as express from 'express';
-import * as identity from '../../../src/common/providers/identity';
+import { expect } from "chai";
+import * as express from "express";
+import * as identity from "../../../src/common/providers/identity";
 
-const EVENT = 'EVENT_TYPE';
+const EVENT = "EVENT_TYPE";
 const now = new Date();
 
-describe('identity', () => {
-  describe('userRecordConstructor', () => {
-    it('will provide falsey values for fields that are not in raw wire data', () => {
-      const record = identity.userRecordConstructor({ uid: '123' });
+describe("identity", () => {
+  describe("userRecordConstructor", () => {
+    it("will provide falsey values for fields that are not in raw wire data", () => {
+      const record = identity.userRecordConstructor({ uid: "123" });
       expect(record.toJSON()).to.deep.equal({
-        uid: '123',
+        uid: "123",
         email: null,
         emailVerified: false,
         displayName: null,
@@ -51,66 +51,66 @@ describe('identity', () => {
       });
     });
 
-    it('will not interfere with fields that are in raw wire data', () => {
+    it("will not interfere with fields that are in raw wire data", () => {
       const raw: any = {
-        uid: '123',
-        email: 'email@gmail.com',
+        uid: "123",
+        email: "email@gmail.com",
         emailVerified: true,
-        displayName: 'User',
-        photoURL: 'url',
-        phoneNumber: '1233332222',
+        displayName: "User",
+        photoURL: "url",
+        phoneNumber: "1233332222",
         disabled: true,
         providerData: [],
         customClaims: {},
-        passwordSalt: 'abc',
-        passwordHash: 'def',
-        tokensValidAfterTime: '2027-02-02T23:01:19.797Z',
+        passwordSalt: "abc",
+        passwordHash: "def",
+        tokensValidAfterTime: "2027-02-02T23:01:19.797Z",
         metadata: {
-          creationTime: '2017-02-02T23:06:26.124Z',
-          lastSignInTime: '2017-02-02T23:01:19.797Z',
+          creationTime: "2017-02-02T23:06:26.124Z",
+          lastSignInTime: "2017-02-02T23:01:19.797Z",
         },
       };
       const record = identity.userRecordConstructor(raw);
       expect(record.toJSON()).to.deep.equal(raw);
     });
 
-    it('will convert raw wire fields createdAt and lastSignedInAt to creationTime and lastSignInTime', () => {
+    it("will convert raw wire fields createdAt and lastSignedInAt to creationTime and lastSignInTime", () => {
       const raw: any = {
-        uid: '123',
+        uid: "123",
         metadata: {
-          createdAt: '2017-02-02T23:06:26.124Z',
-          lastSignedInAt: '2017-02-02T23:01:19.797Z',
+          createdAt: "2017-02-02T23:06:26.124Z",
+          lastSignedInAt: "2017-02-02T23:01:19.797Z",
         },
       };
       const record = identity.userRecordConstructor(raw);
       expect(record.metadata).to.deep.equal({
-        creationTime: '2017-02-02T23:06:26.124Z',
-        lastSignInTime: '2017-02-02T23:01:19.797Z',
+        creationTime: "2017-02-02T23:06:26.124Z",
+        lastSignInTime: "2017-02-02T23:01:19.797Z",
       });
     });
 
-    it('should stringify the record', () => {
+    it("should stringify the record", () => {
       const raw: any = {
-        uid: '123',
-        email: 'email@gmail.com',
+        uid: "123",
+        email: "email@gmail.com",
         emailVerified: true,
-        displayName: 'User',
-        photoURL: 'url',
-        phoneNumber: '1233332222',
+        displayName: "User",
+        photoURL: "url",
+        phoneNumber: "1233332222",
         disabled: true,
-        providerData: ['something'],
+        providerData: ["something"],
         customClaims: {
-          claim: 'value',
+          claim: "value",
           another: {
-            inner: 'value',
+            inner: "value",
           },
         },
-        passwordSalt: 'abc',
-        passwordHash: 'def',
-        tokensValidAfterTime: '2027-02-02T23:01:19.797Z',
+        passwordSalt: "abc",
+        passwordHash: "def",
+        tokensValidAfterTime: "2027-02-02T23:01:19.797Z",
         metadata: {
-          creationTime: '2017-02-02T23:06:26.124Z',
-          lastSignInTime: '2017-02-02T23:01:19.797Z',
+          creationTime: "2017-02-02T23:06:26.124Z",
+          lastSignInTime: "2017-02-02T23:01:19.797Z",
         },
       };
       const record = identity.userRecordConstructor(raw);
@@ -118,94 +118,94 @@ describe('identity', () => {
     });
   });
 
-  describe('isValidRequest', () => {
-    it('should error on non-post', () => {
-      const req = ({
-        method: 'GET',
+  describe("isValidRequest", () => {
+    it("should error on non-post", () => {
+      const req = {
+        method: "GET",
         header: {
-          'Content-Type': 'application/json',
+          "Content-Type": "application/json",
         },
         body: {
           data: {
-            jwt: '1.2.3',
+            jwt: "1.2.3",
           },
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.false;
     });
 
-    it('should error on bad Content-Type', () => {
-      const req = ({
-        method: 'POST',
-        header(val: string) {
-          return 'text/css';
+    it("should error on bad Content-Type", () => {
+      const req = {
+        method: "POST",
+        header() {
+          return "text/css";
         },
         body: {
           data: {
-            jwt: '1.2.3',
+            jwt: "1.2.3",
           },
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.false;
     });
 
-    it('should error without req body', () => {
-      const req = ({
-        method: 'POST',
-        header(val: string) {
-          return 'application/json';
+    it("should error without req body", () => {
+      const req = {
+        method: "POST",
+        header() {
+          return "application/json";
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.false;
     });
 
-    it('should error without req body data', () => {
-      const req = ({
-        method: 'POST',
-        header(val: string) {
-          return 'application/json';
+    it("should error without req body data", () => {
+      const req = {
+        method: "POST",
+        header() {
+          return "application/json";
         },
         body: {},
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.false;
     });
 
-    it('should error without req body', () => {
-      const req = ({
-        method: 'POST',
-        header(val: string) {
-          return 'application/json';
+    it("should error without req body", () => {
+      const req = {
+        method: "POST",
+        header() {
+          return "application/json";
         },
         body: {
           data: {},
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.false;
     });
 
-    it('should not error on valid request', () => {
-      const req = ({
-        method: 'POST',
-        header(val: string) {
-          return 'application/json';
+    it("should not error on valid request", () => {
+      const req = {
+        method: "POST",
+        header() {
+          return "application/json";
         },
         body: {
           data: {
-            jwt: '1.2.3',
+            jwt: "1.2.3",
           },
         },
-      } as unknown) as express.Request;
+      } as unknown as express.Request;
 
       expect(identity.isValidRequest(req)).to.be.true;
     });
   });
 
-  describe('parseMetadata', () => {
+  describe("parseMetadata", () => {
     const decodedMetadata = {
       last_sign_in_time: 1476235905,
       creation_time: 1476136676,
@@ -215,86 +215,80 @@ describe('identity', () => {
       creationTime: new Date(1476136676000).toUTCString(),
     };
 
-    it('should parse an undefined object', () => {
+    it("should parse an undefined object", () => {
       expect(identity.parseMetadata({})).to.deep.equal({
         creationTime: null,
         lastSignInTime: null,
       });
     });
 
-    it('should parse a decoded metadata object', () => {
+    it("should parse a decoded metadata object", () => {
       const md = identity.parseMetadata(decodedMetadata);
 
       expect(md).to.deep.equal(metadata);
     });
   });
 
-  describe('parseProviderData', () => {
+  describe("parseProviderData", () => {
     const decodedUserInfo = {
-      provider_id: 'google.com',
-      display_name: 'John Doe',
-      photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
-      uid: '1234567890',
-      email: 'user@gmail.com',
+      provider_id: "google.com",
+      display_name: "John Doe",
+      photo_url: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
+      uid: "1234567890",
+      email: "user@gmail.com",
     };
     const userInfo = {
-      providerId: 'google.com',
-      displayName: 'John Doe',
-      photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
-      uid: '1234567890',
-      email: 'user@gmail.com',
+      providerId: "google.com",
+      displayName: "John Doe",
+      photoURL: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
+      uid: "1234567890",
+      email: "user@gmail.com",
       phoneNumber: undefined,
     };
     const decodedUserInfoPhone = {
-      provider_id: 'phone',
-      phone_number: '+11234567890',
-      uid: '+11234567890',
+      provider_id: "phone",
+      phone_number: "+11234567890",
+      uid: "+11234567890",
     };
     const userInfoPhone = {
-      providerId: 'phone',
+      providerId: "phone",
       displayName: undefined,
       photoURL: undefined,
-      uid: '+11234567890',
+      uid: "+11234567890",
       email: undefined,
-      phoneNumber: '+11234567890',
+      phoneNumber: "+11234567890",
     };
 
-    it('should parse the user info', () => {
-      expect(identity.parseProviderData([decodedUserInfo])).to.deep.equal([
-        userInfo,
-      ]);
+    it("should parse the user info", () => {
+      expect(identity.parseProviderData([decodedUserInfo])).to.deep.equal([userInfo]);
     });
 
-    it('should parse the user info with phone', () => {
-      expect(identity.parseProviderData([decodedUserInfoPhone])).to.deep.equal([
-        userInfoPhone,
-      ]);
+    it("should parse the user info with phone", () => {
+      expect(identity.parseProviderData([decodedUserInfoPhone])).to.deep.equal([userInfoPhone]);
     });
   });
 
-  describe('parseDate', () => {
-    it('should return null if tokens undefined', () => {
+  describe("parseDate", () => {
+    it("should return null if tokens undefined", () => {
       expect(identity.parseDate()).to.be.null;
     });
 
-    it('should parse the date', () => {
-      expect(identity.parseDate(1476136676)).to.equal(
-        new Date(1476136676000).toUTCString()
-      );
+    it("should parse the date", () => {
+      expect(identity.parseDate(1476136676)).to.equal(new Date(1476136676000).toUTCString());
     });
   });
 
-  describe('parseMultiFactor', () => {
+  describe("parseMultiFactor", () => {
     const decodedMultiFactors = {
       enrolled_factors: [
         {
-          uid: 'enrollmentId1',
-          display_name: 'displayName1',
+          uid: "enrollmentId1",
+          display_name: "displayName1",
           enrollment_time: now.toISOString(),
-          phone_number: '+16505551234',
+          phone_number: "+16505551234",
         },
         {
-          uid: 'enrollmentId2',
+          uid: "enrollmentId2",
           enrollment_time: now.toISOString(),
         },
       ],
@@ -302,14 +296,14 @@ describe('identity', () => {
     const multiFactors = {
       enrolledFactors: [
         {
-          uid: 'enrollmentId1',
-          displayName: 'displayName1',
+          uid: "enrollmentId1",
+          displayName: "displayName1",
           enrollmentTime: now.toUTCString(),
-          phoneNumber: '+16505551234',
-          factorId: 'phone',
+          phoneNumber: "+16505551234",
+          factorId: "phone",
         },
         {
-          uid: 'enrollmentId2',
+          uid: "enrollmentId2",
           displayName: undefined,
           enrollmentTime: now.toUTCString(),
           factorId: undefined,
@@ -318,68 +312,66 @@ describe('identity', () => {
       ],
     };
 
-    it('should return null on undefined factor', () => {
+    it("should return null on undefined factor", () => {
       expect(identity.parseMultiFactor()).to.be.null;
     });
 
-    it('should return null without enrolled factors', () => {
+    it("should return null without enrolled factors", () => {
       expect(identity.parseMultiFactor({})).to.be.null;
     });
 
-    it('should error on an invalid factor', () => {
+    it("should error on an invalid factor", () => {
       const factors = {
         enrolled_factors: [{} as identity.DecodedPayloadMfaInfo],
       };
 
       expect(() => identity.parseMultiFactor(factors)).to.throw(
-        'INTERNAL ASSERT FAILED: Invalid multi-factor info response'
+        "INTERNAL ASSERT FAILED: Invalid multi-factor info response"
       );
     });
 
-    it('should correctly parse factors', () => {
-      expect(identity.parseMultiFactor(decodedMultiFactors)).to.deep.equal(
-        multiFactors
-      );
+    it("should correctly parse factors", () => {
+      expect(identity.parseMultiFactor(decodedMultiFactors)).to.deep.equal(multiFactors);
     });
   });
 
-  describe('parseUserRecord', () => {
+  describe("parseUserRecord", () => {
     const decodedUserRecord = {
-      uid: 'abcdefghijklmnopqrstuvwxyz',
-      email: 'user@gmail.com',
+      uid: "abcdefghijklmnopqrstuvwxyz",
+      email: "user@gmail.com",
       email_verified: true,
-      display_name: 'John Doe',
-      phone_number: '+11234567890',
+      display_name: "John Doe",
+      phone_number: "+11234567890",
       provider_data: [
         {
-          provider_id: 'google.com',
-          display_name: 'John Doe',
-          photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
-          email: 'user@gmail.com',
-          uid: '1234567890',
+          provider_id: "google.com",
+          display_name: "John Doe",
+          photo_url: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
+          email: "user@gmail.com",
+          uid: "1234567890",
         },
         {
-          provider_id: 'facebook.com',
-          display_name: 'John Smith',
-          photo_url: 'https://facebook.com/0987654321/photo.jpg',
-          email: 'user@facebook.com',
-          uid: '0987654321',
+          provider_id: "facebook.com",
+          display_name: "John Smith",
+          photo_url: "https://facebook.com/0987654321/photo.jpg",
+          email: "user@facebook.com",
+          uid: "0987654321",
         },
         {
-          provider_id: 'phone',
-          uid: '+11234567890',
-          phone_number: '+11234567890',
+          provider_id: "phone",
+          uid: "+11234567890",
+          phone_number: "+11234567890",
         },
         {
-          provider_id: 'password',
-          email: 'user@gmail.com',
-          uid: 'user@gmail.com',
-          display_name: 'John Doe',
+          provider_id: "password",
+          email: "user@gmail.com",
+          uid: "user@gmail.com",
+          display_name: "John Doe",
         },
       ],
-      password_hash: 'passwordHash',
-      password_salt: 'passwordSalt',
-      photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
+      password_hash: "passwordHash",
+      password_salt: "passwordSalt",
+      photo_url: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
       tokens_valid_after_time: 1476136676,
       metadata: {
         last_sign_in_time: 1476235905,
@@ -387,154 +379,154 @@ describe('identity', () => {
       },
       custom_claims: {
         admin: true,
-        group_id: 'group123',
+        group_id: "group123",
       },
-      tenant_id: 'TENANT_ID',
+      tenant_id: "TENANT_ID",
       multi_factor: {
         enrolled_factors: [
           {
-            uid: 'enrollmentId1',
-            display_name: 'displayName1',
+            uid: "enrollmentId1",
+            display_name: "displayName1",
             enrollment_time: now.toISOString(),
-            phone_number: '+16505551234',
-            factor_id: 'phone',
+            phone_number: "+16505551234",
+            factor_id: "phone",
           },
           {
-            uid: 'enrollmentId2',
+            uid: "enrollmentId2",
             enrollment_time: now.toISOString(),
-            phone_number: '+16505556789',
-            factor_id: 'phone',
+            phone_number: "+16505556789",
+            factor_id: "phone",
           },
         ],
       },
     };
 
     const userRecord = {
-      uid: 'abcdefghijklmnopqrstuvwxyz',
-      email: 'user@gmail.com',
-      phoneNumber: '+11234567890',
+      uid: "abcdefghijklmnopqrstuvwxyz",
+      email: "user@gmail.com",
+      phoneNumber: "+11234567890",
       emailVerified: true,
       disabled: false,
-      displayName: 'John Doe',
+      displayName: "John Doe",
       providerData: [
         {
-          providerId: 'google.com',
-          displayName: 'John Doe',
-          photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
-          email: 'user@gmail.com',
-          uid: '1234567890',
+          providerId: "google.com",
+          displayName: "John Doe",
+          photoURL: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
+          email: "user@gmail.com",
+          uid: "1234567890",
           phoneNumber: undefined,
         },
         {
-          providerId: 'facebook.com',
-          displayName: 'John Smith',
-          photoURL: 'https://facebook.com/0987654321/photo.jpg',
-          email: 'user@facebook.com',
-          uid: '0987654321',
+          providerId: "facebook.com",
+          displayName: "John Smith",
+          photoURL: "https://facebook.com/0987654321/photo.jpg",
+          email: "user@facebook.com",
+          uid: "0987654321",
           phoneNumber: undefined,
         },
         {
-          providerId: 'phone',
+          providerId: "phone",
           displayName: undefined,
           photoURL: undefined,
           email: undefined,
-          uid: '+11234567890',
-          phoneNumber: '+11234567890',
+          uid: "+11234567890",
+          phoneNumber: "+11234567890",
         },
         {
-          providerId: 'password',
-          displayName: 'John Doe',
+          providerId: "password",
+          displayName: "John Doe",
           photoURL: undefined,
-          email: 'user@gmail.com',
-          uid: 'user@gmail.com',
+          email: "user@gmail.com",
+          uid: "user@gmail.com",
           phoneNumber: undefined,
         },
       ],
-      passwordHash: 'passwordHash',
-      passwordSalt: 'passwordSalt',
-      photoURL: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
+      passwordHash: "passwordHash",
+      passwordSalt: "passwordSalt",
+      photoURL: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
       metadata: {
         lastSignInTime: new Date(1476235905000).toUTCString(),
         creationTime: new Date(1476136676000).toUTCString(),
       },
       customClaims: {
         admin: true,
-        group_id: 'group123',
+        group_id: "group123",
       },
       tokensValidAfterTime: new Date(1476136676000).toUTCString(),
-      tenantId: 'TENANT_ID',
+      tenantId: "TENANT_ID",
       multiFactor: {
         enrolledFactors: [
           {
-            uid: 'enrollmentId1',
-            displayName: 'displayName1',
+            uid: "enrollmentId1",
+            displayName: "displayName1",
             enrollmentTime: now.toUTCString(),
-            phoneNumber: '+16505551234',
-            factorId: 'phone',
+            phoneNumber: "+16505551234",
+            factorId: "phone",
           },
           {
-            uid: 'enrollmentId2',
+            uid: "enrollmentId2",
             displayName: undefined,
             enrollmentTime: now.toUTCString(),
-            phoneNumber: '+16505556789',
-            factorId: 'phone',
+            phoneNumber: "+16505556789",
+            factorId: "phone",
           },
         ],
       },
     };
 
-    it('should error if decoded does not have uid', () => {
-      expect(() =>
-        identity.parseAuthUserRecord({} as identity.DecodedPayloadUserRecord)
-      ).to.throw('INTERNAL ASSERT FAILED: Invalid user response');
+    it("should error if decoded does not have uid", () => {
+      expect(() => identity.parseAuthUserRecord({} as identity.DecodedPayloadUserRecord)).to.throw(
+        "INTERNAL ASSERT FAILED: Invalid user response"
+      );
     });
 
-    it('should parse user record', () => {
+    it("should parse user record", () => {
       const ur = identity.parseAuthUserRecord(decodedUserRecord);
 
       expect(ur).to.deep.equal(userRecord);
     });
   });
 
-  describe('parseAuthEventContext', () => {
+  describe("parseAuthEventContext", () => {
     const rawUserInfo = {
-      name: 'John Doe',
+      name: "John Doe",
       granted_scopes:
-        'openid https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile',
-      id: '123456789',
+        "openid https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile",
+      id: "123456789",
       verified_email: true,
-      given_name: 'John',
-      locale: 'en',
-      family_name: 'Doe',
-      email: 'johndoe@gmail.com',
-      picture: 'https://lh3.googleusercontent.com/1233456789/mo/photo.jpg',
+      given_name: "John",
+      locale: "en",
+      family_name: "Doe",
+      email: "johndoe@gmail.com",
+      picture: "https://lh3.googleusercontent.com/1233456789/mo/photo.jpg",
     };
 
-    it('should parse an unknown event', () => {
+    it("should parse an unknown event", () => {
       const decodedJwt = {
-        aud: 'https://us-east1-project_id.cloudfunctions.net/function-1',
+        aud: "https://us-east1-project_id.cloudfunctions.net/function-1",
         exp: 60 * 60 + 1,
         iat: 1,
-        iss: 'https://securetoken.google.com/project_id',
-        sub: 'someUid',
-        uid: 'someUid',
-        event_id: 'EVENT_ID',
+        iss: "https://securetoken.google.com/project_id",
+        sub: "someUid",
+        uid: "someUid",
+        event_id: "EVENT_ID",
         event_type: EVENT,
-        ip_address: '1.2.3.4',
-        user_agent: 'USER_AGENT',
-        locale: 'en',
+        ip_address: "1.2.3.4",
+        user_agent: "USER_AGENT",
+        locale: "en",
         raw_user_info: JSON.stringify(rawUserInfo),
       };
       const context = {
-        locale: 'en',
-        ipAddress: '1.2.3.4',
-        userAgent: 'USER_AGENT',
-        eventId: 'EVENT_ID',
+        locale: "en",
+        ipAddress: "1.2.3.4",
+        userAgent: "USER_AGENT",
+        eventId: "EVENT_ID",
         eventType: EVENT,
-        authType: 'UNAUTHENTICATED',
+        authType: "UNAUTHENTICATED",
         resource: {
-          service: 'identitytoolkit.googleapis.com',
-          name: 'projects/project-id',
+          service: "identitytoolkit.googleapis.com",
+          name: "projects/project-id",
         },
         timestamp: new Date(1000).toUTCString(),
         additionalUserInfo: {
@@ -547,101 +539,97 @@ describe('identity', () => {
         params: {},
       };
 
-      expect(
-        identity.parseAuthEventContext(decodedJwt, 'project-id')
-      ).to.deep.equal(context);
+      expect(identity.parseAuthEventContext(decodedJwt, "project-id")).to.deep.equal(context);
     });
 
-    it('should parse a beforeSignIn event', () => {
+    it("should parse a beforeSignIn event", () => {
       const time = now.getTime();
       const decodedJwt = {
-        aud: 'https://us-east1-project_id.cloudfunctions.net/function-1',
+        aud: "https://us-east1-project_id.cloudfunctions.net/function-1",
         exp: 60 * 60 + 1,
         iat: 1,
-        iss: 'https://securetoken.google.com/project_id',
-        sub: 'someUid',
-        uid: 'someUid',
-        event_id: 'EVENT_ID',
-        event_type: 'beforeSignIn',
-        ip_address: '1.2.3.4',
-        user_agent: 'USER_AGENT',
-        locale: 'en',
-        sign_in_method: 'password',
+        iss: "https://securetoken.google.com/project_id",
+        sub: "someUid",
+        uid: "someUid",
+        event_id: "EVENT_ID",
+        event_type: "beforeSignIn",
+        ip_address: "1.2.3.4",
+        user_agent: "USER_AGENT",
+        locale: "en",
+        sign_in_method: "password",
         raw_user_info: JSON.stringify(rawUserInfo),
-        oauth_id_token: 'ID_TOKEN',
-        oauth_access_token: 'ACCESS_TOKEN',
-        oauth_refresh_token: 'REFRESH_TOKEN',
-        oauth_token_secret: 'OAUTH_TOKEN_SECRET',
+        oauth_id_token: "ID_TOKEN",
+        oauth_access_token: "ACCESS_TOKEN",
+        oauth_refresh_token: "REFRESH_TOKEN",
+        oauth_token_secret: "OAUTH_TOKEN_SECRET",
         oauth_expires_in: 3600,
       };
       const context = {
-        locale: 'en',
-        ipAddress: '1.2.3.4',
-        userAgent: 'USER_AGENT',
-        eventId: 'EVENT_ID',
-        eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn:password',
-        authType: 'UNAUTHENTICATED',
+        locale: "en",
+        ipAddress: "1.2.3.4",
+        userAgent: "USER_AGENT",
+        eventId: "EVENT_ID",
+        eventType: "providers/cloud.auth/eventTypes/user.beforeSignIn:password",
+        authType: "UNAUTHENTICATED",
         resource: {
-          service: 'identitytoolkit.googleapis.com',
-          name: 'projects/project-id',
+          service: "identitytoolkit.googleapis.com",
+          name: "projects/project-id",
         },
         timestamp: new Date(1000).toUTCString(),
         additionalUserInfo: {
-          providerId: 'password',
+          providerId: "password",
           profile: rawUserInfo,
           username: undefined,
           isNewUser: false,
         },
         credential: {
           claims: undefined,
-          idToken: 'ID_TOKEN',
-          accessToken: 'ACCESS_TOKEN',
-          refreshToken: 'REFRESH_TOKEN',
+          idToken: "ID_TOKEN",
+          accessToken: "ACCESS_TOKEN",
+          refreshToken: "REFRESH_TOKEN",
           expirationTime: new Date(time + 3600 * 1000).toUTCString(),
-          secret: 'OAUTH_TOKEN_SECRET',
-          providerId: 'password',
-          signInMethod: 'password',
+          secret: "OAUTH_TOKEN_SECRET",
+          providerId: "password",
+          signInMethod: "password",
         },
         params: {},
       };
 
-      expect(
-        identity.parseAuthEventContext(decodedJwt, 'project-id', time)
-      ).to.deep.equal(context);
+      expect(identity.parseAuthEventContext(decodedJwt, "project-id", time)).to.deep.equal(context);
     });
 
-    it('should parse a beforeCreate event', () => {
+    it("should parse a beforeCreate event", () => {
       const time = now.getTime();
       // beforeCreate
       const decodedJwt = {
-        aud: 'https://us-east1-project_id.cloudfunctions.net/beforeCreate',
+        aud: "https://us-east1-project_id.cloudfunctions.net/beforeCreate",
         exp: 60 * 60 + 1,
         iat: 1,
-        iss: 'https://securetoken.google.com/project_id',
-        sub: 'abcdefghijklmnopqrstuvwxyz',
-        uid: 'abcdefghijklmnopqrstuvwxyz',
-        event_id: 'EVENT_ID',
-        event_type: 'beforeCreate',
-        ip_address: '1.2.3.4',
-        user_agent: 'USER_AGENT',
-        locale: 'en',
-        sign_in_method: 'oidc.provider',
-        tenant_id: 'TENANT_ID',
+        iss: "https://securetoken.google.com/project_id",
+        sub: "abcdefghijklmnopqrstuvwxyz",
+        uid: "abcdefghijklmnopqrstuvwxyz",
+        event_id: "EVENT_ID",
+        event_type: "beforeCreate",
+        ip_address: "1.2.3.4",
+        user_agent: "USER_AGENT",
+        locale: "en",
+        sign_in_method: "oidc.provider",
+        tenant_id: "TENANT_ID",
         user_record: {
-          uid: 'abcdefghijklmnopqrstuvwxyz',
-          email: 'user@gmail.com',
+          uid: "abcdefghijklmnopqrstuvwxyz",
+          email: "user@gmail.com",
           email_verified: true,
-          display_name: 'John Doe',
-          phone_number: '+11234567890',
+          display_name: "John Doe",
+          phone_number: "+11234567890",
           provider_data: [
             {
-              provider_id: 'oidc.provider',
-              email: 'user@gmail.com',
-              uid: 'user@gmail.com',
-              display_name: 'John Doe',
+              provider_id: "oidc.provider",
+              email: "user@gmail.com",
+              uid: "user@gmail.com",
+              display_name: "John Doe",
             },
           ],
-          photo_url: 'https://lh3.googleusercontent.com/1234567890/photo.jpg',
+          photo_url: "https://lh3.googleusercontent.com/1234567890/photo.jpg",
           tokens_valid_after_time: 1476136676,
           metadata: {
             last_sign_in_time: 1476235905,
@@ -649,138 +637,128 @@ describe('identity', () => {
           },
           custom_claims: {
             admin: true,
-            group_id: 'group123',
+            group_id: "group123",
           },
-          tenant_id: 'TENANT_ID',
+          tenant_id: "TENANT_ID",
         },
-        oauth_id_token: 'ID_TOKEN',
-        oauth_access_token: 'ACCESS_TOKEN',
-        oauth_refresh_token: 'REFRESH_TOKEN',
-        oauth_token_secret: 'OAUTH_TOKEN_SECRET',
+        oauth_id_token: "ID_TOKEN",
+        oauth_access_token: "ACCESS_TOKEN",
+        oauth_refresh_token: "REFRESH_TOKEN",
+        oauth_token_secret: "OAUTH_TOKEN_SECRET",
         oauth_expires_in: 3600,
         raw_user_info: JSON.stringify(rawUserInfo),
       };
       const context = {
-        locale: 'en',
-        ipAddress: '1.2.3.4',
-        userAgent: 'USER_AGENT',
-        eventId: 'EVENT_ID',
-        eventType:
-          'providers/cloud.auth/eventTypes/user.beforeCreate:oidc.provider',
-        authType: 'USER',
+        locale: "en",
+        ipAddress: "1.2.3.4",
+        userAgent: "USER_AGENT",
+        eventId: "EVENT_ID",
+        eventType: "providers/cloud.auth/eventTypes/user.beforeCreate:oidc.provider",
+        authType: "USER",
         resource: {
-          service: 'identitytoolkit.googleapis.com',
-          name: 'projects/project-id/tenants/TENANT_ID',
+          service: "identitytoolkit.googleapis.com",
+          name: "projects/project-id/tenants/TENANT_ID",
         },
         timestamp: new Date(1000).toUTCString(),
         additionalUserInfo: {
           username: undefined,
-          providerId: 'oidc.provider',
+          providerId: "oidc.provider",
           profile: rawUserInfo,
           isNewUser: true,
         },
         credential: {
           claims: undefined,
-          accessToken: 'ACCESS_TOKEN',
+          accessToken: "ACCESS_TOKEN",
           expirationTime: new Date(time + 3600 * 1000).toUTCString(),
-          idToken: 'ID_TOKEN',
-          providerId: 'oidc.provider',
-          refreshToken: 'REFRESH_TOKEN',
-          secret: 'OAUTH_TOKEN_SECRET',
-          signInMethod: 'oidc.provider',
+          idToken: "ID_TOKEN",
+          providerId: "oidc.provider",
+          refreshToken: "REFRESH_TOKEN",
+          secret: "OAUTH_TOKEN_SECRET",
+          signInMethod: "oidc.provider",
         },
         params: {},
       };
 
-      expect(
-        identity.parseAuthEventContext(decodedJwt, 'project-id', time)
-      ).to.deep.equal(context);
+      expect(identity.parseAuthEventContext(decodedJwt, "project-id", time)).to.deep.equal(context);
     });
   });
 
-  describe('validateAuthResponse', () => {
-    it('should not throw on undefined request', () => {
-      expect(() => identity.validateAuthResponse('event', undefined)).to.not
-        .throw;
+  describe("validateAuthResponse", () => {
+    it("should not throw on undefined request", () => {
+      expect(() => identity.validateAuthResponse("event", undefined)).to.not.throw;
     });
 
-    it('should throw an error if customClaims have a blocked claim', () => {
+    it("should throw an error if customClaims have a blocked claim", () => {
       expect(() =>
-        identity.validateAuthResponse('beforeCreate', {
-          customClaims: { acr: 'something' },
+        identity.validateAuthResponse("beforeCreate", {
+          customClaims: { acr: "something" },
         })
-      ).to.throw(
-        'The customClaims claims "acr" are reserved and cannot be specified.'
-      );
+      ).to.throw('The customClaims claims "acr" are reserved and cannot be specified.');
     });
 
-    it('should throw an error if customClaims size is too big', () => {
-      const str = 'x'.repeat(1000);
+    it("should throw an error if customClaims size is too big", () => {
+      const str = "x".repeat(1000);
 
       expect(() =>
-        identity.validateAuthResponse('beforeCreate', {
+        identity.validateAuthResponse("beforeCreate", {
           customClaims: { idk: str },
         })
-      ).to.throw('The customClaims payload should not exceed 1000 characters.');
+      ).to.throw("The customClaims payload should not exceed 1000 characters.");
     });
 
-    it('should throw an error if sessionClaims have a blocked claim', () => {
+    it("should throw an error if sessionClaims have a blocked claim", () => {
       expect(() =>
-        identity.validateAuthResponse('beforeSignIn', {
-          sessionClaims: { acr: 'something' },
+        identity.validateAuthResponse("beforeSignIn", {
+          sessionClaims: { acr: "something" },
         })
-      ).to.throw(
-        'The sessionClaims claims "acr" are reserved and cannot be specified.'
-      );
+      ).to.throw('The sessionClaims claims "acr" are reserved and cannot be specified.');
     });
 
-    it('should throw an error if sessionClaims size is too big', () => {
-      const str = 'x'.repeat(1000);
+    it("should throw an error if sessionClaims size is too big", () => {
+      const str = "x".repeat(1000);
 
       expect(() =>
-        identity.validateAuthResponse('beforeSignIn', {
+        identity.validateAuthResponse("beforeSignIn", {
           sessionClaims: { idk: str },
         })
-      ).to.throw(
-        'The sessionClaims payload should not exceed 1000 characters.'
-      );
+      ).to.throw("The sessionClaims payload should not exceed 1000 characters.");
     });
 
-    it('should throw an error if the combined customClaims & sessionClaims size is too big', () => {
-      const str = 'x'.repeat(501);
+    it("should throw an error if the combined customClaims & sessionClaims size is too big", () => {
+      const str = "x".repeat(501);
 
       expect(() =>
-        identity.validateAuthResponse('beforeSignIn', {
+        identity.validateAuthResponse("beforeSignIn", {
           customClaims: { cc: str },
           sessionClaims: { sc: str },
         })
       ).to.throw(
-        'The customClaims and sessionClaims payloads should not exceed 1000 characters combined.'
+        "The customClaims and sessionClaims payloads should not exceed 1000 characters combined."
       );
     });
   });
 
-  describe('getUpdateMask', () => {
-    it('should return empty string on undefined response', () => {
-      expect(identity.getUpdateMask()).to.eq('');
+  describe("getUpdateMask", () => {
+    it("should return empty string on undefined response", () => {
+      expect(identity.getUpdateMask()).to.eq("");
     });
 
-    it('should return the right claims on a response', () => {
+    it("should return the right claims on a response", () => {
       const response = {
-        displayName: 'john',
+        displayName: "john",
         disabled: false,
         emailVerified: true,
-        photoURL: 'google.com',
+        photoURL: "google.com",
         customClaims: {
-          claim1: 'abc',
+          claim1: "abc",
         },
         sessionClaims: {
-          claim2: 'def',
+          claim2: "def",
         },
       };
 
       expect(identity.getUpdateMask(response)).to.eq(
-        'displayName,disabled,emailVerified,photoURL,customClaims,sessionClaims'
+        "displayName,disabled,emailVerified,photoURL,customClaims,sessionClaims"
       );
     });
   });
diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts
index 6811f0b2a..0e1058e7b 100644
--- a/spec/common/providers/tasks.spec.ts
+++ b/spec/common/providers/tasks.spec.ts
@@ -20,23 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as firebase from 'firebase-admin';
+import { expect } from "chai";
+import { App, initializeApp } from "firebase-admin/app";
 
-import { apps as appsNamespace } from '../../../src/apps';
-import * as https from '../../../src/common/providers/https';
-import {
-  onDispatchHandler,
-  Request,
-  TaskContext,
-} from '../../../src/common/providers/tasks';
-import * as mocks from '../../fixtures/credential/key.json';
-import {
-  generateIdToken,
-  generateUnsignedIdToken,
-  mockRequest,
-} from '../../fixtures/mockrequest';
-import { checkAuthContext, runHandler } from '../../helper';
+import { getApp, setApp } from "../../../src/common/app";
+import * as https from "../../../src/common/providers/https";
+import { onDispatchHandler, Request, TaskContext } from "../../../src/common/providers/tasks";
+import * as mocks from "../../fixtures/credential/key.json";
+import { generateIdToken, generateUnsignedIdToken, mockRequest } from "../../fixtures/mockrequest";
+import { checkAuthContext, runHandler } from "../../helper";
 
 /** Represents a test case for a Task Queue Function */
 interface TaskTest {
@@ -56,20 +48,20 @@ interface TaskTest {
 
 // Runs a TaskTest test.
 export async function runTaskTest(test: TaskTest): Promise<any> {
-  const taskQueueFunctionV1 = onDispatchHandler((data, context) => {
+  const taskQueueFunctionV1 = onDispatchHandler(async (data, context) => {
     expect(data).to.deep.equal(test.expectedData);
     if (test.taskFunction) {
-      test.taskFunction(data, context);
+      await test.taskFunction(data, context);
     }
   });
 
   const responseV1 = await runHandler(taskQueueFunctionV1, test.httpRequest);
   expect(responseV1.status).to.equal(test.expectedStatus);
 
-  const taskQueueFunctionV2 = onDispatchHandler((request) => {
+  const taskQueueFunctionV2 = onDispatchHandler(async (request) => {
     expect(request.data).to.deep.equal(test.expectedData);
     if (test.taskFunction2) {
-      test.taskFunction2(request);
+      await test.taskFunction2(request);
     }
   });
 
@@ -77,13 +69,13 @@ export async function runTaskTest(test: TaskTest): Promise<any> {
   expect(responseV2.status).to.equal(test.expectedStatus);
 }
 
-describe('onEnqueueHandler', () => {
-  let app: firebase.app.App;
+describe("onEnqueueHandler", () => {
+  let app: App;
 
   function mockEnqueueRequest(
     data: unknown,
-    contentType: string = 'application/json',
-    context: { authorization?: string } = { authorization: 'Bearer abc' }
+    contentType = "application/json",
+    context: { authorization?: string } = { authorization: "Bearer abc" }
   ): ReturnType<typeof mockRequest> {
     return mockRequest(data, contentType, context);
   }
@@ -93,38 +85,40 @@ describe('onEnqueueHandler', () => {
       getAccessToken: () => {
         return Promise.resolve({
           expires_in: 1000,
-          access_token: 'fake',
+          access_token: "fake",
         });
       },
       getCertificate: () => {
         return {
-          projectId: 'aProjectId',
+          projectId: "aProjectId",
         };
       },
     };
-    app = firebase.initializeApp({
-      projectId: 'aProjectId',
-      credential,
-    });
-    Object.defineProperty(appsNamespace(), 'admin', { get: () => app });
+    app = initializeApp(
+      {
+        projectId: "aProjectId",
+        credential,
+      },
+      "tq-test-app"
+    );
+    setApp(app);
   });
 
   after(() => {
-    app.delete();
-    delete appsNamespace.singleton;
+    setApp(undefined);
   });
 
-  it('should handle success', () => {
+  it("should handle success", () => {
     return runTaskTest({
-      httpRequest: mockEnqueueRequest({ foo: 'bar' }),
-      expectedData: { foo: 'bar' },
+      httpRequest: mockEnqueueRequest({ foo: "bar" }),
+      expectedData: { foo: "bar" },
       expectedStatus: 204,
     });
   });
 
-  it('should reject bad method', () => {
+  it("should reject bad method", () => {
     const req = mockRequest(null);
-    req.method = 'GET';
+    req.method = "GET";
     return runTaskTest({
       httpRequest: req,
       expectedData: null,
@@ -132,25 +126,25 @@ describe('onEnqueueHandler', () => {
     });
   });
 
-  it('should ignore charset', () => {
+  it("should ignore charset", () => {
     return runTaskTest({
-      httpRequest: mockEnqueueRequest(null, 'application/json; charset=utf-8'),
+      httpRequest: mockEnqueueRequest(null, "application/json; charset=utf-8"),
       expectedData: null,
       expectedStatus: 204,
     });
   });
 
-  it('should reject bad content type', () => {
+  it("should reject bad content type", () => {
     return runTaskTest({
-      httpRequest: mockEnqueueRequest(null, 'text/plain'),
+      httpRequest: mockEnqueueRequest(null, "text/plain"),
       expectedData: null,
       expectedStatus: 400,
     });
   });
 
-  it('should reject extra body fields', () => {
+  it("should reject extra body fields", () => {
     const req = mockEnqueueRequest(null);
-    req.body.extra = 'bad';
+    req.body.extra = "bad";
     return runTaskTest({
       httpRequest: req,
       expectedData: null,
@@ -158,54 +152,54 @@ describe('onEnqueueHandler', () => {
     });
   });
 
-  it('should handle unhandled error', () => {
+  it("should handle unhandled error", () => {
     return runTaskTest({
       httpRequest: mockEnqueueRequest(null),
       expectedData: null,
-      taskFunction: (data, context) => {
+      taskFunction: () => {
         throw new Error(`ceci n'est pas une error`);
       },
-      taskFunction2: (request) => {
+      taskFunction2: () => {
         throw new Error(`cece n'est pas une error`);
       },
       expectedStatus: 500,
     });
   });
 
-  it('should handle unknown error status', () => {
+  it("should handle unknown error status", () => {
     return runTaskTest({
       httpRequest: mockEnqueueRequest(null),
       expectedData: null,
-      taskFunction: (data, context) => {
-        throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope');
+      taskFunction: () => {
+        throw new https.HttpsError("THIS_IS_NOT_VALID" as any, "nope");
       },
-      taskFunction2: (request) => {
-        throw new https.HttpsError('THIS_IS_NOT_VALID' as any, 'nope');
+      taskFunction2: () => {
+        throw new https.HttpsError("THIS_IS_NOT_VALID" as any, "nope");
       },
       expectedStatus: 500,
     });
   });
 
-  it('should handle well-formed error', () => {
+  it("should handle well-formed error", () => {
     return runTaskTest({
       httpRequest: mockEnqueueRequest(null),
       expectedData: null,
-      taskFunction: (data, context) => {
-        throw new https.HttpsError('not-found', 'i am error');
+      taskFunction: () => {
+        throw new https.HttpsError("not-found", "i am error");
       },
-      taskFunction2: (request) => {
-        throw new https.HttpsError('not-found', 'i am error');
+      taskFunction2: () => {
+        throw new https.HttpsError("not-found", "i am error");
       },
       expectedStatus: 404,
     });
   });
 
-  it('should handle auth', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+  it("should handle auth", async () => {
+    const projectId = getApp().options.projectId;
     const idToken = generateIdToken(projectId);
     await runTaskTest({
-      httpRequest: mockEnqueueRequest(null, 'application/json', {
-        authorization: 'Bearer ' + idToken,
+      httpRequest: mockEnqueueRequest(null, "application/json", {
+        authorization: "Bearer " + idToken,
       }),
       expectedData: null,
       taskFunction: (data, context) => {
@@ -220,12 +214,12 @@ describe('onEnqueueHandler', () => {
     });
   });
 
-  it('should accept unsigned auth too', async () => {
-    const projectId = appsNamespace().admin.options.projectId;
+  it("should accept unsigned auth too", async () => {
+    const projectId = getApp().options.projectId;
     const idToken = generateUnsignedIdToken(projectId);
     await runTaskTest({
-      httpRequest: mockEnqueueRequest(null, 'application/json', {
-        authorization: 'Bearer ' + idToken,
+      httpRequest: mockEnqueueRequest(null, "application/json", {
+        authorization: "Bearer " + idToken,
       }),
       expectedData: null,
       taskFunction: (data, context) => {
@@ -240,12 +234,12 @@ describe('onEnqueueHandler', () => {
     });
   });
 
-  it('should skip auth in emulated environment', async () => {
+  it("should skip auth in emulated environment", async () => {
     const restore = process.env.FUNCTIONS_EMULATOR;
-    process.env.FUNCTIONS_EMULATOR = 'true';
+    process.env.FUNCTIONS_EMULATOR = "true";
 
     await runTaskTest({
-      httpRequest: mockEnqueueRequest(null, 'application/json', {}),
+      httpRequest: mockEnqueueRequest(null, "application/json", {}),
       expectedData: null,
       taskFunction: (data, context) => {
         expect(context.auth).to.be.undefined;
diff --git a/spec/common/trace.spec.ts b/spec/common/trace.spec.ts
new file mode 100644
index 000000000..9f30d3f82
--- /dev/null
+++ b/spec/common/trace.spec.ts
@@ -0,0 +1,103 @@
+import { expect } from "chai";
+import { extractTraceContext } from "../../src/common/trace";
+
+describe("getTraceContext", () => {
+  it("reutrns undefined given object without trace properties", () => {
+    expect(extractTraceContext({ foo: "bar" })).to.be.undefined;
+  });
+
+  describe("traceparent", () => {
+    it("extracts trace context with sampling on", () => {
+      expect(
+        extractTraceContext({
+          traceparent: "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "0af7651916cd43dd8448eb211c80319c",
+        parentId: "b7ad6b7169203331",
+        sample: true,
+      });
+    });
+
+    it("extracts trace context with sampling off", () => {
+      expect(
+        extractTraceContext({
+          traceparent: "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-00",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "0af7651916cd43dd8448eb211c80319c",
+        parentId: "b7ad6b7169203331",
+        sample: false,
+      });
+    });
+
+    it("returns undefined given invalid trace id", () => {
+      expect(extractTraceContext({ traceparent: "00-0af7651916cd43dd8448eb211c80319c-ABCDEFG-00" }))
+        .to.be.undefined;
+    });
+  });
+
+  describe("X-Cloud-Trace-Context", () => {
+    it("extracts trace context with sampling on", () => {
+      expect(
+        extractTraceContext({
+          ["X-Cloud-Trace-Context"]: "105445aa7843bc8bf206b12000100000/2450465917091935019;o=1",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "105445aa7843bc8bf206b12000100000",
+        parentId: "2201cdc4ba777400",
+        sample: true,
+      });
+    });
+
+    it("extracts trace context with sampling on indicated w/ o=3", () => {
+      expect(
+        extractTraceContext({
+          ["X-Cloud-Trace-Context"]: "105445aa7843bc8bf206b12000100000/2450465917091935019;o=3",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "105445aa7843bc8bf206b12000100000",
+        parentId: "2201cdc4ba777400",
+        sample: true,
+      });
+    });
+
+    it("extracts trace context with sampling off", () => {
+      expect(
+        extractTraceContext({
+          ["X-Cloud-Trace-Context"]: "105445aa7843bc8bf206b12000100000/2450465917091935019;o=0",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "105445aa7843bc8bf206b12000100000",
+        parentId: "2201cdc4ba777400",
+        sample: false,
+      });
+    });
+
+    it("extracts trace context with no sampling info", () => {
+      expect(
+        extractTraceContext({
+          ["X-Cloud-Trace-Context"]: "105445aa7843bc8bf206b12000100000/2450465917091935019",
+        })
+      ).to.deep.equal({
+        version: "00",
+        traceId: "105445aa7843bc8bf206b12000100000",
+        parentId: "2201cdc4ba777400",
+        sample: false,
+      });
+    });
+
+    it("returns undefined given invalid parentId", () => {
+      expect(
+        extractTraceContext({
+          ["X-Cloud-Trace-Context"]: "105445aa7843bc8bf206b12000100000/abcedf;o=0",
+        })
+      ).to.be.undefined;
+    });
+  });
+});
diff --git a/spec/common/utilities/path-pattern.spec.ts b/spec/common/utilities/path-pattern.spec.ts
new file mode 100644
index 000000000..fc19f3955
--- /dev/null
+++ b/spec/common/utilities/path-pattern.spec.ts
@@ -0,0 +1,129 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+import { expect } from "chai";
+import * as pathPattern from "../../../src/common/utilities/path-pattern";
+
+describe("path-pattern", () => {
+  describe("trimParam", () => {
+    it("should trim a capture param without equals", () => {
+      expect(pathPattern.trimParam("{something}")).to.equal("something");
+    });
+
+    it("should trim a capture param with equals", () => {
+      expect(pathPattern.trimParam("{something=*}")).to.equal("something");
+    });
+  });
+
+  describe("extractMatches", () => {
+    it("should parse without multi segment", () => {
+      const pp = new pathPattern.PathPattern("{a}/something/else/{b}/end/{c}");
+
+      expect(pp.extractMatches("match_a/something/else/match_b/end/match_c")).to.deep.equal({
+        a: "match_a",
+        b: "match_b",
+        c: "match_c",
+      });
+    });
+
+    it("should parse multi segment with params after", () => {
+      const pp = new pathPattern.PathPattern("something/**/else/{a}/hello/{b}/world");
+
+      expect(pp.extractMatches("something/is/a/thing/else/nothing/hello/user/world")).to.deep.equal(
+        {
+          a: "nothing",
+          b: "user",
+        }
+      );
+    });
+
+    it("should parse multi segment param with params after", () => {
+      const pp = new pathPattern.PathPattern("something/{path=**}/else/{a}/hello/{b}/world");
+
+      expect(pp.extractMatches("something/is/a/thing/else/nothing/hello/user/world")).to.deep.equal(
+        {
+          path: "is/a/thing",
+          a: "nothing",
+          b: "user",
+        }
+      );
+    });
+
+    it("should parse multi segment with params before", () => {
+      const pp = new pathPattern.PathPattern("{a}/something/{b}/**/end");
+
+      expect(
+        pp.extractMatches("match_a/something/match_b/thing/else/nothing/hello/user/end")
+      ).to.deep.equal({
+        a: "match_a",
+        b: "match_b",
+      });
+    });
+
+    it("should parse multi segment param with params before", () => {
+      const pp = new pathPattern.PathPattern("{a}/something/{b}/{path=**}/end");
+
+      expect(
+        pp.extractMatches("match_a/something/match_b/thing/else/nothing/hello/user/end")
+      ).to.deep.equal({
+        a: "match_a",
+        b: "match_b",
+        path: "thing/else/nothing/hello/user",
+      });
+    });
+
+    it("should parse multi segment with params before and after", () => {
+      const pp = new pathPattern.PathPattern("{a}/something/**/{b}/end");
+
+      expect(
+        pp.extractMatches("match_a/something/thing/else/nothing/hello/user/match_b/end")
+      ).to.deep.equal({
+        a: "match_a",
+        b: "match_b",
+      });
+    });
+
+    it("should parse multi segment param with params before", () => {
+      const pp = new pathPattern.PathPattern("{a}/something/{path=**}/{b}/end");
+
+      expect(
+        pp.extractMatches("match_a/something/thing/else/nothing/hello/user/match_b/end")
+      ).to.deep.equal({
+        a: "match_a",
+        b: "match_b",
+        path: "thing/else/nothing/hello/user",
+      });
+    });
+
+    // handle an instance param
+    it("should parse an instance", () => {
+      const pp = new pathPattern.PathPattern("{a}-something-{b}-else-{c}");
+
+      expect(pp.extractMatches("match_a-something-match_b-else-match_c")).to.deep.equal({});
+
+      const anotherPP = new pathPattern.PathPattern("{a}");
+
+      expect(anotherPP.extractMatches("match_a")).to.deep.equal({
+        a: "match_a",
+      });
+    });
+  });
+});
diff --git a/spec/common/utilities/path.spec.ts b/spec/common/utilities/path.spec.ts
new file mode 100644
index 000000000..3fcf65c3a
--- /dev/null
+++ b/spec/common/utilities/path.spec.ts
@@ -0,0 +1,24 @@
+import { expect } from "chai";
+import { normalizePath, pathParts } from "../../../src/common/utilities/path";
+
+describe("utilities", () => {
+  describe("path", () => {
+    describe("#normalizePath", () => {
+      it("should strip leading and trailing slash", () => {
+        expect(normalizePath("/my/path/is/{rad}/")).to.eq("my/path/is/{rad}");
+      });
+    });
+
+    describe("#pathParts", () => {
+      it("should turn a path into an array of strings", () => {
+        expect(pathParts("/foo/bar/baz")).to.deep.equal(["foo", "bar", "baz"]);
+      });
+
+      it("should turn a root path, empty string, or null path into an empty array", () => {
+        expect(pathParts("")).to.deep.equal([]);
+        expect(pathParts(null)).to.deep.equal([]);
+        expect(pathParts("/")).to.deep.equal([]);
+      });
+    });
+  });
+});
diff --git a/spec/fixtures.ts b/spec/fixtures.ts
new file mode 100644
index 000000000..ddc2084fd
--- /dev/null
+++ b/spec/fixtures.ts
@@ -0,0 +1,64 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+import { ManifestEndpoint } from "../src/runtime/manifest";
+import { RESET_VALUE } from "../src/common/options";
+
+export const MINIMAL_V2_ENDPOINT: ManifestEndpoint = {
+  availableMemoryMb: RESET_VALUE,
+  concurrency: RESET_VALUE,
+  ingressSettings: RESET_VALUE,
+  maxInstances: RESET_VALUE,
+  minInstances: RESET_VALUE,
+  serviceAccountEmail: RESET_VALUE,
+  timeoutSeconds: RESET_VALUE,
+  vpc: RESET_VALUE,
+};
+
+export const MINIMAL_V1_ENDPOINT: ManifestEndpoint = {
+  availableMemoryMb: RESET_VALUE,
+  ingressSettings: RESET_VALUE,
+  maxInstances: RESET_VALUE,
+  minInstances: RESET_VALUE,
+  serviceAccountEmail: RESET_VALUE,
+  timeoutSeconds: RESET_VALUE,
+  vpc: RESET_VALUE,
+};
+
+export const FULL_ENDPOINT: ManifestEndpoint = {
+  region: ["us-west1"],
+  availableMemoryMb: 512,
+  timeoutSeconds: 60,
+  minInstances: 1,
+  maxInstances: 3,
+  concurrency: 20,
+  vpc: {
+    connector: "aConnector",
+    egressSettings: "ALL_TRAFFIC",
+  },
+  serviceAccountEmail: "root@",
+  ingressSettings: "ALLOW_ALL",
+  cpu: "gcf_gen1",
+  labels: {
+    hello: "world",
+  },
+  secretEnvironmentVariables: [{ key: "MY_SECRET" }],
+};
diff --git a/spec/fixtures/mockrequest.ts b/spec/fixtures/mockrequest.ts
index a1f55c8e1..928960bd4 100644
--- a/spec/fixtures/mockrequest.ts
+++ b/spec/fixtures/mockrequest.ts
@@ -1,6 +1,5 @@
 import * as jwt from 'jsonwebtoken';
 import * as jwkToPem from 'jwk-to-pem';
-import * as _ from 'lodash';
 import * as nock from 'nock';
 import * as mockJWK from '../fixtures/credential/jwk.json';
 import * as mockKey from '../fixtures/credential/key.json';
@@ -32,7 +31,7 @@ export function mockRequest(
   } = {}
 ) {
   const body: any = {};
-  if (!_.isUndefined(data)) {
+  if (typeof data !== 'undefined') {
     body.data = data;
   }
 
diff --git a/spec/fixtures/sources/commonjs-grouped/g1.js b/spec/fixtures/sources/commonjs-grouped/g1.js
index 7250c863d..4ddf39aa3 100644
--- a/spec/fixtures/sources/commonjs-grouped/g1.js
+++ b/spec/fixtures/sources/commonjs-grouped/g1.js
@@ -1,4 +1,4 @@
-const functions = require("../../../../src/index");
+const functions = require("../../../../src/v1");
 
 exports.groupedhttp = functions.https.onRequest((req, resp) => {
     resp.status(200).send("PASS");
diff --git a/spec/fixtures/sources/commonjs-grouped/index.js b/spec/fixtures/sources/commonjs-grouped/index.js
index aafcf8145..385f8ea79 100644
--- a/spec/fixtures/sources/commonjs-grouped/index.js
+++ b/spec/fixtures/sources/commonjs-grouped/index.js
@@ -1,5 +1,5 @@
-const functions = require("../../../../src/index");
-const functionsv2 = require("../../../../src/v2/index");
+const functions = require("../../../../src/v1");
+const functionsv2 = require("../../../../src/v2");
 
 exports.v1http = functions.https.onRequest((req, resp) => {
     resp.status(200).send("PASS");
diff --git a/spec/fixtures/sources/commonjs-main/functions.js b/spec/fixtures/sources/commonjs-main/functions.js
index 526599142..31b0ae2fa 100644
--- a/spec/fixtures/sources/commonjs-main/functions.js
+++ b/spec/fixtures/sources/commonjs-main/functions.js
@@ -1,5 +1,5 @@
-const functions = require("../../../../src/index");
-const functionsv2 = require("../../../../src/v2/index");
+const functions = require("../../../../src/v1");
+const functionsv2 = require("../../../../src/v2");
 
 exports.v1http = functions.https.onRequest((req, resp) => {
     resp.status(200).send("PASS");
diff --git a/spec/fixtures/sources/commonjs-params/index.js b/spec/fixtures/sources/commonjs-params/index.js
index 5c783dd18..5f982fcaa 100644
--- a/spec/fixtures/sources/commonjs-params/index.js
+++ b/spec/fixtures/sources/commonjs-params/index.js
@@ -1,29 +1,40 @@
-const functions = require("../../../../src/index");
+const functions = require("../../../../src/v1/index");
 const functionsv2 = require("../../../../src/v2/index");
-const params = require("../../../../src/v2/params");
+const params = require("../../../../src/params");
 
 params.defineString("BORING");
-params.defineString("FOO", {input: {text: {validationRegex:"\w+"}}});
-params.defineString("BAR", {default: "{{ params.FOO }}", label: "asdf"});
-params.defineString("BAZ", {input: {select: {options: [{value: "a"}, {value: "b"}]}}});
+const foo = params.defineString("FOO", { input: { text: { validationRegex: "w+" } } });
+const bar = params.defineString("BAR", { default: foo , label: "asdf" });
+params.defineString("BAZ", { input: { select: { options: [{ value: "a" }, { value: "b" }] } } });
 
-params.defineInt("AN_INT", {default: 22});
-params.defineInt("ANOTHER_INT", {input: {select: {options:[{label: "a", value: -2}, {"label": "b", value: 2}]}}});
+params.defineInt("AN_INT", { default: bar.equals("qux").then(0, 1) });
+params.defineInt("ANOTHER_INT", {
+  input: {
+    select: {
+      options: [
+        { label: "a", value: -2 },
+        { label: "b", value: 2 },
+      ],
+    },
+  },
+});
+
+params.defineSecret("SUPER_SECRET_FLAG");
 
-params.defineSecret("SUPER_SECRET_FLAG")
+// N.B: invocation of the precanned internal params should not affect the manifest
 
 exports.v1http = functions.https.onRequest((req, resp) => {
-    resp.status(200).send("PASS");
+  resp.status(200).send(params.projectID);
 });
 
 exports.v1callable = functions.https.onCall(() => {
-    return "PASS";
+  return params.databaseURL;
 });
 
 exports.v2http = functionsv2.https.onRequest((req, resp) => {
-    resp.status(200).send("PASS");
+  resp.status(200).send(params.gcloudProject);
 });
 
 exports.v2callable = functionsv2.https.onCall(() => {
-    return "PASS";
+  return params.databaseURL;
 });
diff --git a/spec/fixtures/sources/commonjs/index.js b/spec/fixtures/sources/commonjs/index.js
index 526599142..31b0ae2fa 100644
--- a/spec/fixtures/sources/commonjs/index.js
+++ b/spec/fixtures/sources/commonjs/index.js
@@ -1,5 +1,5 @@
-const functions = require("../../../../src/index");
-const functionsv2 = require("../../../../src/v2/index");
+const functions = require("../../../../src/v1");
+const functionsv2 = require("../../../../src/v2");
 
 exports.v1http = functions.https.onRequest((req, resp) => {
     resp.status(200).send("PASS");
diff --git a/spec/helper.ts b/spec/helper.ts
index a0cb57db3..8dd78d82c 100644
--- a/spec/helper.ts
+++ b/spec/helper.ts
@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as express from 'express';
+import { expect } from "chai";
+import * as express from "express";
 
-import * as https from '../src/common/providers/https';
-import * as tasks from '../src/common/providers/tasks';
+import * as https from "../src/common/providers/https";
+import * as tasks from "../src/common/providers/tasks";
 
 /**
  * RunHandlerResult contains the data from an express.Response.
@@ -43,13 +43,13 @@ export function runHandler(
   handler: express.Handler,
   request: https.Request
 ): Promise<RunHandlerResult> {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     // MockResponse mocks an express.Response.
     // This class lives here so it can reference resolve and reject.
     class MockResponse {
       private statusCode = 0;
       private headers: { [name: string]: string } = {};
-      private callback: Function;
+      private callback: () => void;
 
       public status(code: number) {
         this.statusCode = code;
@@ -80,14 +80,13 @@ export function runHandler(
         this.send(undefined);
       }
 
-      public on(event: string, callback: Function) {
-        if (event !== 'finish') {
-          throw new Error('MockResponse only implements the finish event');
+      public on(event: string, callback: () => void) {
+        if (event !== "finish") {
+          throw new Error("MockResponse only implements the finish event");
         }
         this.callback = callback;
       }
     }
-
     const response = new MockResponse();
     handler(request, response as any, () => undefined);
   });
@@ -106,7 +105,7 @@ export function checkAuthContext(
   expect(context.auth.token.aud).to.equal(projectId);
 
   // TaskContext & TaskRequest don't have instanceIdToken
-  if ({}.hasOwnProperty.call(context, 'instanceIdToken')) {
+  if ({}.hasOwnProperty.call(context, "instanceIdToken")) {
     expect((context as https.CallableContext).instanceIdToken).to.be.undefined;
   }
 }
diff --git a/spec/logger.spec.ts b/spec/logger.spec.ts
index c82497d31..6e47cef32 100644
--- a/spec/logger.spec.ts
+++ b/spec/logger.spec.ts
@@ -1,13 +1,8 @@
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import * as logger from '../src/logger';
+import * as logger from "../src/logger";
 
-const SUPPORTS_STRUCTURED_LOGS =
-  parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10;
-
-describe(`logger (${
-  SUPPORTS_STRUCTURED_LOGS ? 'structured' : 'unstructured'
-})`, () => {
+describe("logger", () => {
   const stdoutWrite = process.stdout.write.bind(process.stdout);
   const stderrWrite = process.stderr.write.bind(process.stderr);
   let lastOut: string;
@@ -30,12 +25,7 @@ describe(`logger (${
   });
 
   function expectOutput(last: string, entry: any) {
-    if (SUPPORTS_STRUCTURED_LOGS) {
-      return expect(JSON.parse(last.trim())).to.deep.eq(entry);
-    } else {
-      // legacy logging is not structured, but do a sanity check
-      return expect(last).to.include(entry.message);
-    }
+    return expect(JSON.parse(last.trim())).to.deep.eq(entry);
   }
 
   function expectStdout(entry: any) {
@@ -46,124 +36,118 @@ describe(`logger (${
     return expectOutput(lastErr, entry);
   }
 
-  describe('logging methods', () => {
-    it('should coalesce arguments into the message', () => {
-      logger.log('hello', { middle: 'obj' }, 'end message');
+  describe("logging methods", () => {
+    it("should coalesce arguments into the message", () => {
+      logger.log("hello", { middle: "obj" }, "end message");
       expectStdout({
-        severity: 'INFO',
+        severity: "INFO",
         message: "hello { middle: 'obj' } end message",
       });
     });
 
-    it('should merge structured data from the last argument', () => {
-      logger.log('hello', 'world', { additional: 'context' });
+    it("should merge structured data from the last argument", () => {
+      logger.log("hello", "world", { additional: "context" });
       expectStdout({
-        severity: 'INFO',
-        message: 'hello world',
-        additional: 'context',
+        severity: "INFO",
+        message: "hello world",
+        additional: "context",
       });
     });
 
-    it('should not recognize null as a structured logging object', () => {
-      logger.log('hello', 'world', null);
+    it("should not recognize null as a structured logging object", () => {
+      logger.log("hello", "world", null);
       expectStdout({
-        severity: 'INFO',
-        message: 'hello world null',
+        severity: "INFO",
+        message: "hello world null",
       });
     });
   });
 
-  describe('write', () => {
-    describe('structured logging', () => {
-      describe('write', () => {
-        it('should remove circular references', () => {
-          const circ: any = { b: 'foo' };
+  describe("write", () => {
+    describe("structured logging", () => {
+      describe("write", () => {
+        it("should remove circular references", () => {
+          const circ: any = { b: "foo" };
           circ.circ = circ;
 
           const entry: logger.LogEntry = {
-            severity: 'ERROR',
-            message: 'testing circular',
+            severity: "ERROR",
+            message: "testing circular",
             circ,
           };
           logger.write(entry);
           expectStderr({
-            severity: 'ERROR',
-            message: 'testing circular',
-            circ: { b: 'foo', circ: '[Circular]' },
+            severity: "ERROR",
+            message: "testing circular",
+            circ: { b: "foo", circ: "[Circular]" },
           });
         });
 
-        it('should remove circular references in arrays', () => {
-          const circ: any = { b: 'foo' };
+        it("should remove circular references in arrays", () => {
+          const circ: any = { b: "foo" };
           circ.circ = [circ];
 
           const entry: logger.LogEntry = {
-            severity: 'ERROR',
-            message: 'testing circular',
+            severity: "ERROR",
+            message: "testing circular",
             circ,
           };
           logger.write(entry);
           expectStderr({
-            severity: 'ERROR',
-            message: 'testing circular',
-            circ: { b: 'foo', circ: ['[Circular]'] },
+            severity: "ERROR",
+            message: "testing circular",
+            circ: { b: "foo", circ: ["[Circular]"] },
           });
         });
 
-        it('should not break on objects that override toJSON', () => {
-          const obj: any = { a: new Date('August 26, 1994 12:24:00Z') };
+        it("should not break on objects that override toJSON", () => {
+          const obj: any = { a: new Date("August 26, 1994 12:24:00Z") };
 
           const entry: logger.LogEntry = {
-            severity: 'ERROR',
-            message: 'testing toJSON',
+            severity: "ERROR",
+            message: "testing toJSON",
             obj,
           };
           logger.write(entry);
           expectStderr({
-            severity: 'ERROR',
-            message: 'testing toJSON',
-            obj: { a: '1994-08-26T12:24:00.000Z' },
+            severity: "ERROR",
+            message: "testing toJSON",
+            obj: { a: "1994-08-26T12:24:00.000Z" },
           });
         });
 
-        it('should not alter parameters that are logged', () => {
-          const circ: any = { b: 'foo' };
+        it("should not alter parameters that are logged", () => {
+          const circ: any = { b: "foo" };
           circ.array = [circ];
           circ.object = circ;
           const entry: logger.LogEntry = {
-            severity: 'ERROR',
-            message: 'testing circular',
+            severity: "ERROR",
+            message: "testing circular",
             circ,
           };
           logger.write(entry);
 
-          expect(circ.array[0].b).to.equal('foo');
-          expect(circ.object.b).to.equal('foo');
-          expect(circ.object.array[0].object.array[0].b).to.equal('foo');
+          expect(circ.array[0].b).to.equal("foo");
+          expect(circ.object.b).to.equal("foo");
+          expect(circ.object.array[0].object.array[0].b).to.equal("foo");
         });
 
-        for (const severity of ['DEBUG', 'INFO', 'NOTICE']) {
+        for (const severity of ["DEBUG", "INFO", "NOTICE"]) {
           it(`should output ${severity} severity to stdout`, () => {
             const entry: logger.LogEntry = {
               severity: severity as logger.LogSeverity,
-              message: 'test',
+              message: "test",
             };
             logger.write(entry);
             expectStdout(entry);
           });
         }
 
-        for (const severity of [
-          'WARNING',
-          'ERROR',
-          'CRITICAL',
-          'ALERT',
-          'EMERGENCY',
-        ]) {
+        for (const severity of ["WARNING", "ERROR", "CRITICAL", "ALERT", "EMERGENCY"]) {
           it(`should output ${severity} severity to stderr`, () => {
             const entry: logger.LogEntry = {
               severity: severity as logger.LogSeverity,
-              message: 'test',
+              message: "test",
             };
             logger.write(entry);
             expectStderr(entry);
diff --git a/spec/params/params.spec.ts b/spec/params/params.spec.ts
new file mode 100644
index 000000000..9148d5483
--- /dev/null
+++ b/spec/params/params.spec.ts
@@ -0,0 +1,292 @@
+import { expect } from "chai";
+import * as params from "../../src/params";
+
+describe("Params spec extraction", () => {
+  it("converts Expressions in the param default to strings", () => {
+    const bar = params.defineInt("BAR");
+    expect(
+      params.defineString("FOO", { default: bar.notEquals(22).then("asdf", "jkl;") }).toSpec()
+        .default
+    ).to.equal(`{{ params.BAR != 22 ? "asdf" : "jkl;" }}`);
+  });
+
+  it("converts RegExps in string validation parameters to strings", () => {
+    const foo = params.defineString("FOO", { input: { text: { validationRegex: /\d{5}/ } } });
+    expect(foo.toSpec().input).to.deep.equal({ text: { validationRegex: "\\d{5}" } });
+  });
+});
+
+describe("Params value extraction", () => {
+  beforeEach(() => {
+    process.env.A_STRING = "asdf";
+    process.env.SAME_STRING = "asdf";
+    process.env.DIFF_STRING = "jkl;";
+    process.env.AN_INT = "-11";
+    process.env.SAME_INT = "-11";
+    process.env.DIFF_INT = "22";
+    process.env.PI = "3.14159";
+    process.env.TRUE = "true";
+    process.env.FALSE = "false";
+  });
+
+  afterEach(() => {
+    params.clearParams();
+    delete process.env.A_STRING;
+    delete process.env.SAME_STRING;
+    delete process.env.DIFF_STRING;
+    delete process.env.AN_INT;
+    delete process.env.SAME_INT;
+    delete process.env.DIFF_INT;
+    delete process.env.TRUE;
+    delete process.env.PI;
+    delete process.env.TRUE;
+    delete process.env.FALSE;
+  });
+
+  it("extracts identity params from the environment", () => {
+    const strParam = params.defineString("A_STRING");
+    expect(strParam.value()).to.equal("asdf");
+
+    const intParam = params.defineInt("AN_INT");
+    expect(intParam.value()).to.equal(-11);
+
+    const boolParam = params.defineBoolean("TRUE");
+    expect(boolParam.value()).to.be.true;
+
+    const floatParam = params.defineFloat("PI");
+    expect(floatParam.value()).to.equal(3.14159);
+
+    const falseParam = params.defineBoolean("FALSE");
+    expect(falseParam.value()).to.be.false;
+  });
+
+  it("extracts the special case internal params from env.FIREBASE_CONFIG", () => {
+    process.env.FIREBASE_CONFIG = JSON.stringify({
+      projectId: "foo",
+      storageBucket: "foo.appspot.com",
+      databaseURL: "https://foo.firebaseio.com",
+    });
+    expect(params.databaseURL.value()).to.equal("https://foo.firebaseio.com");
+    expect(params.gcloudProject.value()).to.equal("foo");
+    expect(params.projectID.value()).to.equal("foo");
+    expect(params.storageBucket.value()).to.equal("foo.appspot.com");
+
+    process.env.FIREBASE_CONFIG = JSON.stringify({ projectId: "foo" });
+    expect(params.databaseURL.value()).to.equal("");
+    expect(params.gcloudProject.value()).to.equal("foo");
+    expect(params.projectID.value()).to.equal("foo");
+    expect(params.storageBucket.value()).to.equal("");
+
+    process.env.FIREBASE_CONFIG = JSON.stringify({});
+    expect(params.databaseURL.value()).to.equal("");
+    expect(params.gcloudProject.value()).to.equal("");
+    expect(params.projectID.value()).to.equal("");
+    expect(params.storageBucket.value()).to.equal("");
+
+    delete process.env.FIREBASE_CONFIG;
+  });
+
+  it("falls back on the javascript zero values in case of type mismatch", () => {
+    const stringToInt = params.defineInt("A_STRING");
+    expect(stringToInt.value()).to.equal(0);
+
+    const stringToBool = params.defineBoolean("A_STRING");
+    expect(stringToBool.value()).to.equal(false);
+  });
+
+  it("returns a boolean value for Comparison expressions", () => {
+    const str = params.defineString("A_STRING");
+    const sameStr = params.defineString("SAME_STRING");
+    const diffStr = params.defineString("DIFF_STRING");
+    expect(str.equals(sameStr).value()).to.be.true;
+    expect(str.equals("asdf").value()).to.be.true;
+    expect(str.equals(diffStr).value()).to.be.false;
+    expect(str.equals("jkl;").value()).to.be.false;
+    expect(str.notEquals(diffStr).value()).to.be.true;
+    expect(str.notEquals("jkl;").value()).to.be.true;
+    expect(str.lessThan(diffStr).value()).to.be.true;
+    expect(str.lessThan("jkl;").value()).to.be.true;
+    expect(str.lessThanorEqualTo(diffStr).value()).to.be.true;
+    expect(str.lessThanorEqualTo("jkl;").value()).to.be.true;
+    expect(str.greaterThan(diffStr).value()).to.be.false;
+    expect(str.greaterThan("jkl;").value()).to.be.false;
+    expect(str.greaterThanOrEqualTo(diffStr).value()).to.be.false;
+    expect(str.greaterThanOrEqualTo("jkl;").value()).to.be.false;
+
+    const int = params.defineInt("AN_INT");
+    const sameInt = params.defineInt("SAME_INT");
+    const diffInt = params.defineInt("DIFF_INT");
+    expect(int.equals(sameInt).value()).to.be.true;
+    expect(int.equals(-11).value()).to.be.true;
+    expect(int.equals(diffInt).value()).to.be.false;
+    expect(int.equals(22).value()).to.be.false;
+    expect(int.notEquals(diffInt).value()).to.be.true;
+    expect(int.notEquals(22).value()).to.be.true;
+    expect(int.greaterThan(diffInt).value()).to.be.false;
+    expect(int.greaterThan(22).value()).to.be.false;
+    expect(int.greaterThanOrEqualTo(diffInt).value()).to.be.false;
+    expect(int.greaterThanOrEqualTo(22).value()).to.be.false;
+    expect(int.lessThan(diffInt).value()).to.be.true;
+    expect(int.lessThan(22).value()).to.be.true;
+    expect(int.lessThanorEqualTo(diffInt).value()).to.be.true;
+    expect(int.lessThanorEqualTo(22).value()).to.be.true;
+  });
+
+  it("can use all the comparison operators when explicitly requested", () => {
+    const jkl = params.defineString("DIFF_STRING");
+    expect(jkl.cmp(">", "asdf").value()).to.be.true;
+    expect(jkl.cmp(">", "jkl;").value()).to.be.false;
+    expect(jkl.cmp(">", "qwerty").value()).to.be.false;
+    expect(jkl.cmp(">=", "asdf").value()).to.be.true;
+    expect(jkl.cmp(">=", "jkl;").value()).to.be.true;
+    expect(jkl.cmp(">=", "qwerty").value()).to.be.false;
+    expect(jkl.cmp("<", "asdf").value()).to.be.false;
+    expect(jkl.cmp("<", "jkl;").value()).to.be.false;
+    expect(jkl.cmp("<", "qwerty").value()).to.be.true;
+    expect(jkl.cmp("<=", "asdf").value()).to.be.false;
+    expect(jkl.cmp("<=", "jkl;").value()).to.be.true;
+    expect(jkl.cmp("<=", "qwerty").value()).to.be.true;
+
+    const twentytwo = params.defineInt("DIFF_INT");
+    expect(twentytwo.cmp(">", 11).value()).to.be.true;
+    expect(twentytwo.cmp(">", 22).value()).to.be.false;
+    expect(twentytwo.cmp(">", 33).value()).to.be.false;
+    expect(twentytwo.cmp(">=", 11).value()).to.be.true;
+    expect(twentytwo.cmp(">=", 22).value()).to.be.true;
+    expect(twentytwo.cmp(">=", 33).value()).to.be.false;
+    expect(twentytwo.cmp("<", 11).value()).to.be.false;
+    expect(twentytwo.cmp("<", 22).value()).to.be.false;
+    expect(twentytwo.cmp("<", 33).value()).to.be.true;
+    expect(twentytwo.cmp("<=", 11).value()).to.be.false;
+    expect(twentytwo.cmp("<=", 22).value()).to.be.true;
+    expect(twentytwo.cmp("<=", 33).value()).to.be.true;
+
+    const trueParam = params.defineBoolean("TRUE");
+    expect(trueParam.cmp(">", true).value()).to.be.false;
+    expect(trueParam.cmp(">", false).value()).to.be.true;
+    expect(trueParam.cmp(">=", true).value()).to.be.true;
+    expect(trueParam.cmp(">=", false).value()).to.be.true;
+    expect(trueParam.cmp("<", true).value()).to.be.false;
+    expect(trueParam.cmp("<", false).value()).to.be.false;
+    expect(trueParam.cmp("<=", true).value()).to.be.true;
+    expect(trueParam.cmp("<=", false).value()).to.be.false;
+  });
+
+  it("can select the output of a ternary expression based on the comparison", () => {
+    const trueExpr = params.defineString("A_STRING").equals(params.defineString("SAME_STRING"));
+    expect(trueExpr.then(1, 0).value()).to.equal(1);
+    const falseExpr = params.defineInt("AN_INT").equals(params.defineInt("DIFF_INT"));
+    expect(falseExpr.then(1, 0).value()).to.equal(0);
+
+    const twentytwo = params.defineInt("DIFF_INT");
+    expect(trueExpr.then(twentytwo, 0).value()).to.equal(22);
+    expect(falseExpr.then(1, twentytwo).value()).to.equal(22);
+  });
+});
+
+describe("Params as CEL", () => {
+  it("internal expressions behave like strings", () => {
+    const str = params.defineString("A_STRING");
+
+    expect(params.projectID.toCEL()).to.equal(`{{ params.PROJECT_ID }}`);
+    expect(params.projectID.equals("foo").toCEL()).to.equal(`{{ params.PROJECT_ID == "foo" }}`);
+    expect(params.projectID.equals(str).toCEL()).to.equal(
+      `{{ params.PROJECT_ID == params.A_STRING }}`
+    );
+    expect(params.gcloudProject.toCEL()).to.equal(`{{ params.GCLOUD_PROJECT }}`);
+    expect(params.gcloudProject.equals("foo").toCEL()).to.equal(
+      `{{ params.GCLOUD_PROJECT == "foo" }}`
+    );
+    expect(params.gcloudProject.equals(str).toCEL()).to.equal(
+      `{{ params.GCLOUD_PROJECT == params.A_STRING }}`
+    );
+    expect(params.databaseURL.toCEL()).to.equal(`{{ params.DATABASE_URL }}`);
+    expect(params.databaseURL.equals("foo").toCEL()).to.equal(`{{ params.DATABASE_URL == "foo" }}`);
+    expect(params.databaseURL.equals(str).toCEL()).to.equal(
+      `{{ params.DATABASE_URL == params.A_STRING }}`
+    );
+    expect(params.storageBucket.toCEL()).to.equal(`{{ params.STORAGE_BUCKET }}`);
+    expect(params.storageBucket.equals("foo").toCEL()).to.equal(
+      `{{ params.STORAGE_BUCKET == "foo" }}`
+    );
+    expect(params.storageBucket.equals(str).toCEL()).to.equal(
+      `{{ params.STORAGE_BUCKET == params.A_STRING }}`
+    );
+  });
+
+  it("identity expressions", () => {
+    expect(params.defineString("FOO").toCEL()).to.equal("{{ params.FOO }}");
+    expect(params.defineInt("FOO").toCEL()).to.equal("{{ params.FOO }}");
+    expect(params.defineBoolean("FOO").toCEL()).to.equal("{{ params.FOO }}");
+  });
+
+  it("comparison expressions", () => {
+    expect(params.defineString("FOO").equals(params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO == params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp("==", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO == params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp("!=", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO != params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp(">", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO > params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp(">=", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO >= params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp("<", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO < params.BAR }}"
+    );
+    expect(params.defineString("FOO").cmp("<=", params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.FOO <= params.BAR }}"
+    );
+
+    expect(params.defineString("FOO").equals("BAR").toCEL()).to.equal('{{ params.FOO == "BAR" }}');
+    expect(params.defineString("FOO").cmp("==", "BAR").toCEL()).to.equal(
+      '{{ params.FOO == "BAR" }}'
+    );
+    expect(params.defineString("FOO").cmp("!=", "BAR").toCEL()).to.equal(
+      '{{ params.FOO != "BAR" }}'
+    );
+    expect(params.defineString("FOO").cmp(">", "BAR").toCEL()).to.equal('{{ params.FOO > "BAR" }}');
+    expect(params.defineString("FOO").cmp(">=", "BAR").toCEL()).to.equal(
+      '{{ params.FOO >= "BAR" }}'
+    );
+    expect(params.defineString("FOO").cmp("<", "BAR").toCEL()).to.equal('{{ params.FOO < "BAR" }}');
+    expect(params.defineString("FOO").cmp("<=", "BAR").toCEL()).to.equal(
+      '{{ params.FOO <= "BAR" }}'
+    );
+
+    expect(params.defineInt("FOO").equals(-11).toCEL()).to.equal("{{ params.FOO == -11 }}");
+    expect(params.defineInt("FOO").cmp("==", -11).toCEL()).to.equal("{{ params.FOO == -11 }}");
+    expect(params.defineInt("FOO").cmp("!=", -11).toCEL()).to.equal("{{ params.FOO != -11 }}");
+    expect(params.defineInt("FOO").cmp(">", -11).toCEL()).to.equal("{{ params.FOO > -11 }}");
+    expect(params.defineInt("FOO").cmp(">=", -11).toCEL()).to.equal("{{ params.FOO >= -11 }}");
+    expect(params.defineInt("FOO").cmp("<", -11).toCEL()).to.equal("{{ params.FOO < -11 }}");
+    expect(params.defineInt("FOO").cmp("<=", -11).toCEL()).to.equal("{{ params.FOO <= -11 }}");
+  });
+
+  it("ternary expressions", () => {
+    const booleanExpr = params.defineBoolean("BOOL");
+    const cmpExpr = params.defineInt("A").cmp("!=", params.defineInt("B"));
+
+    expect(booleanExpr.then("asdf", "jkl;").toCEL()).to.equal(
+      '{{ params.BOOL ? "asdf" : "jkl;" }}'
+    );
+    expect(booleanExpr.then(-11, 22).toCEL()).to.equal("{{ params.BOOL ? -11 : 22 }}");
+    expect(booleanExpr.then(false, true).toCEL()).to.equal("{{ params.BOOL ? false : true }}");
+    expect(
+      booleanExpr.then(params.defineString("FOO"), params.defineString("BAR")).toCEL()
+    ).to.equal("{{ params.BOOL ? params.FOO : params.BAR }}");
+    expect(cmpExpr.then("asdf", "jkl;").toCEL()).to.equal(
+      '{{ params.A != params.B ? "asdf" : "jkl;" }}'
+    );
+    expect(cmpExpr.then(-11, 22).toCEL()).to.equal("{{ params.A != params.B ? -11 : 22 }}");
+    expect(cmpExpr.then(false, true).toCEL()).to.equal("{{ params.A != params.B ? false : true }}");
+    expect(cmpExpr.then(params.defineString("FOO"), params.defineString("BAR")).toCEL()).to.equal(
+      "{{ params.A != params.B ? params.FOO : params.BAR }}"
+    );
+  });
+});
diff --git a/spec/runtime/loader.spec.ts b/spec/runtime/loader.spec.ts
index caae16d14..551ab2f70 100644
--- a/spec/runtime/loader.spec.ts
+++ b/spec/runtime/loader.spec.ts
@@ -1,30 +1,28 @@
-import { expect } from 'chai';
-import * as path from 'path';
-
-import * as functions from '../../src/index';
-import * as loader from '../../src/runtime/loader';
-import {
-  ManifestEndpoint,
-  ManifestRequiredAPI,
-  ManifestStack,
-} from '../../src/runtime/manifest';
-import { clearParams } from '../../src/v2/params';
-
-describe('extractStack', () => {
-  const httpFn = functions.https.onRequest(() => {});
+import { expect } from "chai";
+import * as path from "path";
+
+import * as functions from "../../src/v1";
+import * as loader from "../../src/runtime/loader";
+import { ManifestEndpoint, ManifestRequiredAPI, ManifestStack } from "../../src/runtime/manifest";
+import { clearParams } from "../../src/params";
+import { MINIMAL_V1_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../fixtures";
+import { MINIMAL_SCHEDULE_TRIGGER, MINIMIAL_TASK_QUEUE_TRIGGER } from "../v1/providers/fixtures";
+
+describe("extractStack", () => {
+  const httpFn = functions.https.onRequest(() => undefined);
   const httpEndpoint = {
-    platform: 'gcfv1',
+    platform: "gcfv1",
     httpsTrigger: {},
   };
 
-  const callableFn = functions.https.onCall(() => {});
+  const callableFn = functions.https.onCall(() => undefined);
   const callableEndpoint = {
-    platform: 'gcfv1',
+    platform: "gcfv1",
     labels: {}, // TODO: empty labels?
     callableTrigger: {},
   };
 
-  it('extracts stack from a simple module', () => {
+  it("extracts stack from a simple module", () => {
     const module = {
       http: httpFn,
       callable: callableFn,
@@ -36,16 +34,24 @@ describe('extractStack', () => {
     loader.extractStack(module, endpoints, requiredAPIs);
 
     expect(endpoints).to.be.deep.equal({
-      http: { entryPoint: 'http', ...httpEndpoint },
-      callable: { entryPoint: 'callable', ...callableEndpoint },
+      http: {
+        ...MINIMAL_V1_ENDPOINT,
+        entryPoint: "http",
+        ...httpEndpoint,
+      },
+      callable: {
+        ...MINIMAL_V1_ENDPOINT,
+        entryPoint: "callable",
+        ...callableEndpoint,
+      },
     });
 
     expect(requiredAPIs).to.be.empty;
   });
 
-  it('extracts stack with required APIs', () => {
+  it("extracts stack with required APIs", () => {
     const module = {
-      taskq: functions.tasks.taskQueue().onDispatch(() => {}),
+      taskq: functions.tasks.taskQueue().onDispatch(() => undefined),
     };
 
     const endpoints: Record<string, ManifestEndpoint> = {};
@@ -55,21 +61,22 @@ describe('extractStack', () => {
 
     expect(endpoints).to.be.deep.equal({
       taskq: {
-        entryPoint: 'taskq',
-        platform: 'gcfv1',
-        taskQueueTrigger: {},
+        ...MINIMAL_V1_ENDPOINT,
+        entryPoint: "taskq",
+        platform: "gcfv1",
+        taskQueueTrigger: MINIMIAL_TASK_QUEUE_TRIGGER,
       },
     });
 
     expect(requiredAPIs).to.be.deep.equal([
       {
-        api: 'cloudtasks.googleapis.com',
-        reason: 'Needed for task queue functions',
+        api: "cloudtasks.googleapis.com",
+        reason: "Needed for task queue functions",
       },
     ]);
   });
 
-  it('extracts stack from a module with group functions', () => {
+  it("extracts stack from a module with group functions", () => {
     const module = {
       fn1: httpFn,
       g1: {
@@ -84,18 +91,20 @@ describe('extractStack', () => {
 
     expect(endpoints).to.be.deep.equal({
       fn1: {
-        entryPoint: 'fn1',
+        ...MINIMAL_V1_ENDPOINT,
+        entryPoint: "fn1",
         ...httpEndpoint,
       },
-      'g1-fn2': {
-        entryPoint: 'g1.fn2',
+      "g1-fn2": {
+        ...MINIMAL_V1_ENDPOINT,
+        entryPoint: "g1.fn2",
         ...httpEndpoint,
       },
     });
   });
 
-  describe('with GCLOUD_PROJECT env var', () => {
-    const project = 'my-project';
+  describe("with GCLOUD_PROJECT env var", () => {
+    const project = "my-project";
     let prev;
 
     beforeEach(() => {
@@ -108,9 +117,9 @@ describe('extractStack', () => {
       clearParams();
     });
 
-    it('extracts stack from a simple module', () => {
+    it("extracts stack from a simple module", () => {
       const module = {
-        fn: functions.pubsub.topic('my-topic').onPublish(() => {}),
+        fn: functions.pubsub.topic("my-topic").onPublish(() => undefined),
       };
 
       const endpoints: Record<string, ManifestEndpoint> = {};
@@ -120,12 +129,13 @@ describe('extractStack', () => {
 
       expect(endpoints).to.be.deep.equal({
         fn: {
-          entryPoint: 'fn',
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          entryPoint: "fn",
+          platform: "gcfv1",
           eventTrigger: {
-            eventType: 'google.pubsub.topic.publish',
+            eventType: "google.pubsub.topic.publish",
             eventFilters: {
-              resource: 'projects/my-project/topics/my-topic',
+              resource: "projects/my-project/topics/my-topic",
             },
             retry: false,
           },
@@ -134,9 +144,9 @@ describe('extractStack', () => {
       });
     });
 
-    it('extracts stack with required APIs', () => {
+    it("extracts stack with required APIs", () => {
       const module = {
-        scheduled: functions.pubsub.schedule('every 5 minutes').onRun(() => {}),
+        scheduled: functions.pubsub.schedule("every 5 minutes").onRun(() => undefined),
       };
 
       const endpoints: Record<string, ManifestEndpoint> = {};
@@ -146,106 +156,111 @@ describe('extractStack', () => {
 
       expect(endpoints).to.be.deep.equal({
         scheduled: {
-          entryPoint: 'scheduled',
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          entryPoint: "scheduled",
+          platform: "gcfv1",
           // TODO: This label should not exist?
           labels: {},
-          scheduleTrigger: { schedule: 'every 5 minutes' },
+          scheduleTrigger: { ...MINIMAL_SCHEDULE_TRIGGER, schedule: "every 5 minutes" },
         },
       });
 
       expect(requiredAPIs).to.be.deep.equal([
         {
-          api: 'cloudscheduler.googleapis.com',
-          reason: 'Needed for scheduled functions.',
+          api: "cloudscheduler.googleapis.com",
+          reason: "Needed for scheduled functions.",
         },
       ]);
     });
   });
 });
 
-describe('mergedRequiredAPIs', () => {
-  it('leaves required APIs unchanged if nothing to merge', () => {
+describe("mergedRequiredAPIs", () => {
+  it("leaves required APIs unchanged if nothing to merge", () => {
     expect(
       loader.mergeRequiredAPIs([
-        { api: 'example1.com', reason: 'example1' },
-        { api: 'example2.com', reason: 'example2' },
+        { api: "example1.com", reason: "example1" },
+        { api: "example2.com", reason: "example2" },
       ])
     ).to.be.deep.equal([
-      { api: 'example1.com', reason: 'example1' },
-      { api: 'example2.com', reason: 'example2' },
+      { api: "example1.com", reason: "example1" },
+      { api: "example2.com", reason: "example2" },
     ]);
   });
 
-  it('merges reasons given overlapping required api', () => {
+  it("merges reasons given overlapping required api", () => {
     expect(
       loader.mergeRequiredAPIs([
-        { api: 'example1.com', reason: 'example1a' },
-        { api: 'example1.com', reason: 'example1b' },
-        { api: 'example2.com', reason: 'example2' },
+        { api: "example1.com", reason: "example1a" },
+        { api: "example1.com", reason: "example1b" },
+        { api: "example2.com", reason: "example2" },
       ])
     ).to.be.deep.equal([
-      { api: 'example1.com', reason: 'example1a example1b' },
-      { api: 'example2.com', reason: 'example2' },
+      { api: "example1.com", reason: "example1a example1b" },
+      { api: "example2.com", reason: "example2" },
     ]);
   });
 
-  it('merges reasons given overlapping required api', () => {
+  it("merges reasons given overlapping required api", () => {
     expect(
       loader.mergeRequiredAPIs([
-        { api: 'example1.com', reason: 'example1a' },
-        { api: 'example1.com', reason: 'example1b' },
-        { api: 'example2.com', reason: 'example2' },
+        { api: "example1.com", reason: "example1a" },
+        { api: "example1.com", reason: "example1b" },
+        { api: "example2.com", reason: "example2" },
       ])
     ).to.be.deep.equal([
-      { api: 'example1.com', reason: 'example1a example1b' },
-      { api: 'example2.com', reason: 'example2' },
+      { api: "example1.com", reason: "example1a example1b" },
+      { api: "example2.com", reason: "example2" },
     ]);
   });
 
-  it('does not repeat the same reason', () => {
+  it("does not repeat the same reason", () => {
     expect(
       loader.mergeRequiredAPIs([
-        { api: 'example1.com', reason: 'example1a' },
-        { api: 'example1.com', reason: 'example1a' },
-        { api: 'example2.com', reason: 'example2' },
+        { api: "example1.com", reason: "example1a" },
+        { api: "example1.com", reason: "example1a" },
+        { api: "example2.com", reason: "example2" },
       ])
     ).to.be.deep.equal([
-      { api: 'example1.com', reason: 'example1a' },
-      { api: 'example2.com', reason: 'example2' },
+      { api: "example1.com", reason: "example1a" },
+      { api: "example2.com", reason: "example2" },
     ]);
   });
 });
 
-describe('loadStack', () => {
+describe("loadStack", () => {
   const expected: ManifestStack = {
     endpoints: {
       v1http: {
-        platform: 'gcfv1',
-        entryPoint: 'v1http',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
+        entryPoint: "v1http",
         httpsTrigger: {},
       },
       v1callable: {
-        platform: 'gcfv1',
-        entryPoint: 'v1callable',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
+        entryPoint: "v1callable",
         labels: {},
         callableTrigger: {},
       },
       v2http: {
-        platform: 'gcfv2',
-        entryPoint: 'v2http',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        entryPoint: "v2http",
         labels: {},
         httpsTrigger: {},
       },
       v2callable: {
-        platform: 'gcfv2',
-        entryPoint: 'v2callable',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        entryPoint: "v2callable",
         labels: {},
         callableTrigger: {},
       },
     },
     requiredAPIs: [],
-    specVersion: 'v1alpha1',
+    specVersion: "v1alpha1",
   };
 
   interface Testcase {
@@ -254,13 +269,11 @@ describe('loadStack', () => {
     expected: ManifestStack;
   }
   function runTests(tc: Testcase) {
-    it('loads stack given relative path', async () => {
-      await expect(loader.loadStack(tc.modulePath)).to.eventually.deep.equal(
-        tc.expected
-      );
+    it("loads stack given relative path", async () => {
+      await expect(loader.loadStack(tc.modulePath)).to.eventually.deep.equal(tc.expected);
     });
 
-    it('loads stack given absolute path', async () => {
+    it("loads stack given absolute path", async () => {
       await expect(
         loader.loadStack(path.join(process.cwd(), tc.modulePath))
       ).to.eventually.deep.equal(tc.expected);
@@ -272,40 +285,42 @@ describe('loadStack', () => {
   beforeEach(() => {
     // TODO: When __trigger annotation is removed and GCLOUD_PROJECT is not required at runtime, remove this.
     prev = process.env.GCLOUD_PROJECT;
-    process.env.GCLOUD_PROJECT = 'test-project';
+    process.env.GCLOUD_PROJECT = "test-project";
   });
 
   afterEach(() => {
     process.env.GCLOUD_PROJECT = prev;
   });
 
-  describe('commonjs', () => {
+  describe("commonjs", () => {
     const testcases: Testcase[] = [
       {
-        name: 'basic',
-        modulePath: './spec/fixtures/sources/commonjs',
+        name: "basic",
+        modulePath: "./spec/fixtures/sources/commonjs",
         expected,
       },
       {
-        name: 'has main',
-        modulePath: './spec/fixtures/sources/commonjs-main',
+        name: "has main",
+        modulePath: "./spec/fixtures/sources/commonjs-main",
         expected,
       },
       {
-        name: 'grouped',
-        modulePath: './spec/fixtures/sources/commonjs-grouped',
+        name: "grouped",
+        modulePath: "./spec/fixtures/sources/commonjs-grouped",
         expected: {
           ...expected,
           endpoints: {
             ...expected.endpoints,
-            'g1-groupedhttp': {
-              platform: 'gcfv1',
-              entryPoint: 'g1.groupedhttp',
+            "g1-groupedhttp": {
+              ...MINIMAL_V1_ENDPOINT,
+              platform: "gcfv1",
+              entryPoint: "g1.groupedhttp",
               httpsTrigger: {},
             },
-            'g1-groupedcallable': {
-              platform: 'gcfv1',
-              entryPoint: 'g1.groupedcallable',
+            "g1-groupedcallable": {
+              ...MINIMAL_V1_ENDPOINT,
+              platform: "gcfv1",
+              entryPoint: "g1.groupedcallable",
               labels: {},
               callableTrigger: {},
             },
@@ -313,44 +328,44 @@ describe('loadStack', () => {
         },
       },
       {
-        name: 'has params',
-        modulePath: './spec/fixtures/sources/commonjs-params',
+        name: "has params",
+        modulePath: "./spec/fixtures/sources/commonjs-params",
         expected: {
           ...expected,
           params: [
-            { name: 'BORING', type: 'string' },
+            { name: "BORING", type: "string" },
             {
-              name: 'FOO',
-              type: 'string',
-              input: { text: { validationRegex: 'w+' } },
+              name: "FOO",
+              type: "string",
+              input: { text: { validationRegex: "w+" } },
             },
             {
-              name: 'BAR',
-              type: 'string',
-              default: '{{ params.FOO }}',
-              label: 'asdf',
+              name: "BAR",
+              type: "string",
+              default: "{{ params.FOO }}",
+              label: "asdf",
             },
             {
-              name: 'BAZ',
-              type: 'string',
+              name: "BAZ",
+              type: "string",
               input: {
-                select: { options: [{ value: 'a' }, { value: 'b' }] },
+                select: { options: [{ value: "a" }, { value: "b" }] },
               },
             },
-            { name: 'AN_INT', type: 'int', default: 22 },
+            { name: "AN_INT", type: "int", default: `{{ params.BAR == "qux" ? 0 : 1 }}` },
             {
-              name: 'ANOTHER_INT',
-              type: 'int',
+              name: "ANOTHER_INT",
+              type: "int",
               input: {
                 select: {
                   options: [
-                    { label: 'a', value: -2 },
-                    { label: 'b', value: 2 },
+                    { label: "a", value: -2 },
+                    { label: "b", value: 2 },
                   ],
                 },
               },
             },
-            { name: 'SUPER_SECRET_FLAG', type: 'secret' },
+            { name: "SUPER_SECRET_FLAG", type: "secret" },
           ],
         },
       },
diff --git a/spec/runtime/manifest.spec.ts b/spec/runtime/manifest.spec.ts
index 382a0b41e..e124f6190 100644
--- a/spec/runtime/manifest.spec.ts
+++ b/spec/runtime/manifest.spec.ts
@@ -1,96 +1,169 @@
-import { expect } from 'chai';
-import { ManifestStack, stackToWire } from '../../src/runtime/manifest';
-import * as params from '../../src/v2/params';
+import { expect } from "chai";
+import { stackToWire, ManifestStack } from "../../src/runtime/manifest";
+import * as params from "../../src/params";
+import * as optsv2 from "../../src/v2/options";
+import * as v1 from "../../src/v1";
 
-describe('stackToWire', () => {
+describe("stackToWire", () => {
   afterEach(() => {
     params.clearParams();
   });
 
-  it('converts stack with null values values', () => {
+  it("converts regular expressions used in param inputs", () => {
+    const regExpParam = params.defineString("foo", {
+      input: { text: { validationRegex: /\d{5}/ } },
+    });
+
     const stack: ManifestStack = {
+      endpoints: {},
+      requiredAPIs: [],
+      params: [regExpParam.toSpec()],
+      specVersion: "v1alpha1",
+    };
+    const expected = {
+      endpoints: {},
+      requiredAPIs: [],
+      params: [
+        {
+          name: "foo",
+          type: "string",
+          input: {
+            text: {
+              validationRegex: "\\d{5}",
+            },
+          },
+        },
+      ],
+      specVersion: "v1alpha1",
+    };
+    expect(stackToWire(stack)).to.deep.equal(expected);
+  });
+
+  it("converts stack with null values", () => {
+    const stack: ManifestStack = {
+      endpoints: {
+        v2http: {
+          platform: "gcfv2",
+          entryPoint: "v2http",
+          labels: {},
+          httpsTrigger: {},
+          maxInstances: null,
+        },
+      },
+      requiredAPIs: [],
+      specVersion: "v1alpha1",
+    };
+    const expected = {
       endpoints: {
         v2http: {
-          platform: 'gcfv2',
-          entryPoint: 'v2http',
+          platform: "gcfv2",
+          entryPoint: "v2http",
           labels: {},
           httpsTrigger: {},
           maxInstances: null,
         },
       },
       requiredAPIs: [],
-      specVersion: 'v1alpha1',
+      specVersion: "v1alpha1",
+    };
+    expect(stackToWire(stack)).to.deep.equal(expected);
+  });
+
+  it("converts stack with RESET_VALUES", () => {
+    const stack: ManifestStack = {
+      endpoints: {
+        v1http: {
+          platform: "gcfv1",
+          entryPoint: "v1http",
+          labels: {},
+          httpsTrigger: {},
+          maxInstances: v1.RESET_VALUE,
+        },
+        v2http: {
+          platform: "gcfv2",
+          entryPoint: "v2http",
+          labels: {},
+          httpsTrigger: {},
+          maxInstances: optsv2.RESET_VALUE,
+        },
+      },
+      requiredAPIs: [],
+      specVersion: "v1alpha1",
     };
     const expected = {
       endpoints: {
+        v1http: {
+          platform: "gcfv1",
+          entryPoint: "v1http",
+          labels: {},
+          httpsTrigger: {},
+          maxInstances: null,
+        },
         v2http: {
-          platform: 'gcfv2',
-          entryPoint: 'v2http',
+          platform: "gcfv2",
+          entryPoint: "v2http",
           labels: {},
           httpsTrigger: {},
           maxInstances: null,
         },
       },
       requiredAPIs: [],
-      specVersion: 'v1alpha1',
+      specVersion: "v1alpha1",
     };
     expect(stackToWire(stack)).to.deep.equal(expected);
   });
 
-  it('converts Expression types in endpoint options to CEL', () => {
-    const intParam = params.defineInt('foo', { default: 11 });
-    const stringParam = params.defineString('bar', {
-      default: 'America/Los_Angeles',
+  it("converts Expression types in endpoint options to CEL", () => {
+    const intParam = params.defineInt("foo", { default: 11 });
+    const stringParam = params.defineString("bar", {
+      default: "America/Los_Angeles",
     });
 
     const stack: ManifestStack = {
       endpoints: {
         v2http: {
-          platform: 'gcfv2',
-          entryPoint: 'v2http',
+          platform: "gcfv2",
+          entryPoint: "v2http",
           labels: {},
           httpsTrigger: {},
           concurrency: intParam,
           maxInstances: intParam.equals(24).then(-1, 1),
         },
         v2schedule: {
-          platform: 'gcfv2',
-          entryPoint: 'v2callable',
+          platform: "gcfv2",
+          entryPoint: "v2callable",
           labels: {},
           scheduleTrigger: {
-            schedule: stringParam
-              .equals('America/Mexico_City')
-              .then('mexico', 'usa'),
+            schedule: stringParam.equals("America/Mexico_City").then("mexico", "usa"),
             timeZone: stringParam,
           },
         },
       },
       requiredAPIs: [],
-      specVersion: 'v1alpha1',
+      specVersion: "v1alpha1",
     };
     const expected = {
       endpoints: {
         v2http: {
-          platform: 'gcfv2',
-          entryPoint: 'v2http',
+          platform: "gcfv2",
+          entryPoint: "v2http",
           labels: {},
           httpsTrigger: {},
-          concurrency: '{{ params.foo }}',
-          maxInstances: '{{ params.foo == 24 ? -1 : 1 }}',
+          concurrency: "{{ params.foo }}",
+          maxInstances: "{{ params.foo == 24 ? -1 : 1 }}",
         },
         v2schedule: {
-          platform: 'gcfv2',
-          entryPoint: 'v2callable',
+          platform: "gcfv2",
+          entryPoint: "v2callable",
           labels: {},
           scheduleTrigger: {
-            schedule:
-              '{{ params.bar == "America/Mexico_City" ? "mexico" : "usa" }}',
-            timeZone: '{{ params.bar }}',
+            schedule: '{{ params.bar == "America/Mexico_City" ? "mexico" : "usa" }}',
+            timeZone: "{{ params.bar }}",
           },
         },
       },
       requiredAPIs: [],
-      specVersion: 'v1alpha1',
+      specVersion: "v1alpha1",
     };
     expect(stackToWire(stack)).to.deep.equal(expected);
   });
diff --git a/spec/utilities/path-pattern.spec.ts b/spec/utilities/path-pattern.spec.ts
deleted file mode 100644
index 8fe513284..000000000
--- a/spec/utilities/path-pattern.spec.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2022 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-import { expect } from 'chai';
-import * as pathPattern from '../../src/utilities/path-pattern';
-
-describe('path-pattern', () => {
-  describe('trimParam', () => {
-    it('should trim a capture param without equals', () => {
-      expect(pathPattern.trimParam('{something}')).to.equal('something');
-    });
-
-    it('should trim a capture param with equals', () => {
-      expect(pathPattern.trimParam('{something=*}')).to.equal('something');
-    });
-  });
-
-  describe('extractMatches', () => {
-    it('should parse without multi segment', () => {
-      const pp = new pathPattern.PathPattern('{a}/something/else/{b}/end/{c}');
-
-      expect(
-        pp.extractMatches('match_a/something/else/match_b/end/match_c')
-      ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
-        c: 'match_c',
-      });
-    });
-
-    it('should parse multi segment with params after', () => {
-      const pp = new pathPattern.PathPattern(
-        'something/**/else/{a}/hello/{b}/world'
-      );
-
-      expect(
-        pp.extractMatches('something/is/a/thing/else/nothing/hello/user/world')
-      ).to.deep.equal({
-        a: 'nothing',
-        b: 'user',
-      });
-    });
-
-    it('should parse multi segment param with params after', () => {
-      const pp = new pathPattern.PathPattern(
-        'something/{path=**}/else/{a}/hello/{b}/world'
-      );
-
-      expect(
-        pp.extractMatches('something/is/a/thing/else/nothing/hello/user/world')
-      ).to.deep.equal({
-        path: 'is/a/thing',
-        a: 'nothing',
-        b: 'user',
-      });
-    });
-
-    it('should parse multi segment with params before', () => {
-      const pp = new pathPattern.PathPattern('{a}/something/{b}/**/end');
-
-      expect(
-        pp.extractMatches(
-          'match_a/something/match_b/thing/else/nothing/hello/user/end'
-        )
-      ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
-      });
-    });
-
-    it('should parse multi segment param with params before', () => {
-      const pp = new pathPattern.PathPattern('{a}/something/{b}/{path=**}/end');
-
-      expect(
-        pp.extractMatches(
-          'match_a/something/match_b/thing/else/nothing/hello/user/end'
-        )
-      ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
-        path: 'thing/else/nothing/hello/user',
-      });
-    });
-
-    it('should parse multi segment with params before and after', () => {
-      const pp = new pathPattern.PathPattern('{a}/something/**/{b}/end');
-
-      expect(
-        pp.extractMatches(
-          'match_a/something/thing/else/nothing/hello/user/match_b/end'
-        )
-      ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
-      });
-    });
-
-    it('should parse multi segment param with params before', () => {
-      const pp = new pathPattern.PathPattern('{a}/something/{path=**}/{b}/end');
-
-      expect(
-        pp.extractMatches(
-          'match_a/something/thing/else/nothing/hello/user/match_b/end'
-        )
-      ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
-        path: 'thing/else/nothing/hello/user',
-      });
-    });
-
-    // handle an instance param
-    it('should parse an instance', () => {
-      const pp = new pathPattern.PathPattern('{a}-something-{b}-else-{c}');
-
-      expect(
-        pp.extractMatches('match_a-something-match_b-else-match_c')
-      ).to.deep.equal({});
-
-      const anotherPP = new pathPattern.PathPattern('{a}');
-
-      expect(anotherPP.extractMatches('match_a')).to.deep.equal({
-        a: 'match_a',
-      });
-    });
-  });
-});
diff --git a/spec/utilities/path.spec.ts b/spec/utilities/path.spec.ts
deleted file mode 100644
index c0a5dc318..000000000
--- a/spec/utilities/path.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { expect } from 'chai';
-import { normalizePath, pathParts } from '../../src/utilities/path';
-
-describe('utilities', () => {
-  describe('path', () => {
-    describe('#normalizePath', () => {
-      it('should strip leading and trailing slash', () => {
-        expect(normalizePath('/my/path/is/{rad}/')).to.eq('my/path/is/{rad}');
-      });
-    });
-
-    describe('#pathParts', () => {
-      it('should turn a path into an array of strings', () => {
-        expect(pathParts('/foo/bar/baz')).to.deep.equal(['foo', 'bar', 'baz']);
-      });
-
-      it('should turn a root path, empty string, or null path into an empty array', () => {
-        expect(pathParts('')).to.deep.equal([]);
-        expect(pathParts(null)).to.deep.equal([]);
-        expect(pathParts('/')).to.deep.equal([]);
-      });
-    });
-  });
-});
diff --git a/spec/v1/apps.spec.ts b/spec/v1/apps.spec.ts
deleted file mode 100644
index 89a1b3f5b..000000000
--- a/spec/v1/apps.spec.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2017 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-import { expect } from 'chai';
-import { apps as appsNamespace } from '../../src/apps';
-
-import * as firebase from 'firebase-admin';
-import * as _ from 'lodash';
-import * as sinon from 'sinon';
-
-describe('apps', () => {
-  let apps: appsNamespace.Apps;
-
-  beforeEach(() => {
-    apps = new appsNamespace.Apps();
-  });
-
-  afterEach(() => {
-    _.forEach(firebase.apps, (app) => {
-      app.delete();
-    });
-  });
-
-  describe('retain/release', () => {
-    let clock: sinon.SinonFakeTimers;
-
-    beforeEach(() => {
-      clock = sinon.useFakeTimers();
-    });
-
-    afterEach(() => {
-      clock.restore();
-    });
-
-    it('should retain/release ref counters appropriately', () => {
-      apps.retain();
-      expect(_.get(apps, '_refCounter')).to.deep.equal({
-        __admin__: 1,
-      });
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval);
-      return Promise.resolve().then(() => {
-        expect(_.get(apps, '_refCounter')).to.deep.equal({
-          __admin__: 0,
-        });
-      });
-    });
-
-    it('should only decrement counter after garbageCollectionInterval is up', () => {
-      apps.retain();
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      expect(_.get(apps, '_refCounter')).to.deep.equal({
-        __admin__: 1,
-      });
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      return Promise.resolve().then(() => {
-        expect(_.get(apps, '_refCounter')).to.deep.equal({
-          __admin__: 0,
-        });
-      });
-    });
-
-    it('should call _destroyApp if app no longer used', () => {
-      const spy = sinon.spy(apps, '_destroyApp');
-      apps.retain();
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval);
-      return Promise.resolve().then(() => {
-        expect(spy.called).to.be.true;
-      });
-    });
-
-    it('should not call _destroyApp if app used again while waiting for release', () => {
-      const spy = sinon.spy(apps, '_destroyApp');
-      apps.retain();
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      apps.retain();
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      return Promise.resolve().then(() => {
-        expect(spy.called).to.be.false;
-      });
-    });
-
-    it('should increment ref counter for each subsequent retain', () => {
-      apps.retain();
-      expect(_.get(apps, '_refCounter')).to.deep.equal({
-        __admin__: 1,
-      });
-      apps.retain();
-      expect(_.get(apps, '_refCounter')).to.deep.equal({
-        __admin__: 2,
-      });
-      apps.retain();
-      expect(_.get(apps, '_refCounter')).to.deep.equal({
-        __admin__: 3,
-      });
-    });
-
-    it('should work with staggering sets of retain/release', () => {
-      apps.retain();
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      apps.retain();
-      apps.release();
-      clock.tick(appsNamespace.garbageCollectionInterval / 2);
-      return Promise.resolve()
-        .then(() => {
-          // Counters are still 1 due second set of retain/release
-          expect(_.get(apps, '_refCounter')).to.deep.equal({
-            __admin__: 1,
-          });
-          clock.tick(appsNamespace.garbageCollectionInterval / 2);
-        })
-        .then(() => {
-          // It's now been a full interval since the second set of retain/release
-          expect(_.get(apps, '_refCounter')).to.deep.equal({
-            __admin__: 0,
-          });
-        });
-    });
-  });
-});
diff --git a/spec/v1/cloud-functions.spec.ts b/spec/v1/cloud-functions.spec.ts
index 336c00282..f68269030 100644
--- a/spec/v1/cloud-functions.spec.ts
+++ b/spec/v1/cloud-functions.spec.ts
@@ -20,49 +20,43 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as _ from 'lodash';
+import { expect } from "chai";
 
 import {
   Event,
   EventContext,
   makeCloudFunction,
   MakeCloudFunctionArgs,
-} from '../../src';
+  RESET_VALUE,
+} from "../../src/v1";
+import { MINIMAL_V1_ENDPOINT } from "../fixtures";
 
-describe('makeCloudFunction', () => {
+describe("makeCloudFunction", () => {
   const cloudFunctionArgs: MakeCloudFunctionArgs<any> = {
-    provider: 'mock.provider',
-    eventType: 'mock.event',
-    service: 'service',
-    triggerResource: () => 'resource',
+    provider: "mock.provider",
+    eventType: "mock.event",
+    service: "service",
+    triggerResource: () => "resource",
     handler: () => null,
-    legacyEventType: 'providers/provider/eventTypes/event',
+    legacyEventType: "providers/provider/eventTypes/event",
   };
 
-  it('should put a __trigger/__endpoint on the returned CloudFunction', () => {
+  it("should put a __endpoint on the returned CloudFunction", () => {
     const cf = makeCloudFunction({
-      provider: 'mock.provider',
-      eventType: 'mock.event',
-      service: 'service',
-      triggerResource: () => 'resource',
+      provider: "mock.provider",
+      eventType: "mock.event",
+      service: "service",
+      triggerResource: () => "resource",
       handler: () => null,
     });
 
-    expect(cf.__trigger).to.deep.equal({
-      eventTrigger: {
-        eventType: 'mock.provider.mock.event',
-        resource: 'resource',
-        service: 'service',
-      },
-    });
-
     expect(cf.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       eventTrigger: {
-        eventType: 'mock.provider.mock.event',
+        eventType: "mock.provider.mock.event",
         eventFilters: {
-          resource: 'resource',
+          resource: "resource",
         },
         retry: false,
       },
@@ -70,23 +64,16 @@ describe('makeCloudFunction', () => {
     });
   });
 
-  it('should have legacy event type in __trigger/__endpoint if provided', () => {
+  it("should have legacy event type in __endpoint if provided", () => {
     const cf = makeCloudFunction(cloudFunctionArgs);
 
-    expect(cf.__trigger).to.deep.equal({
-      eventTrigger: {
-        eventType: 'providers/provider/eventTypes/event',
-        resource: 'resource',
-        service: 'service',
-      },
-    });
-
     expect(cf.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       eventTrigger: {
-        eventType: 'providers/provider/eventTypes/event',
+        eventType: "providers/provider/eventTypes/event",
         eventFilters: {
-          resource: 'resource',
+          resource: "resource",
         },
         retry: false,
       },
@@ -94,56 +81,58 @@ describe('makeCloudFunction', () => {
     });
   });
 
-  it('should include converted options in __endpoint', () => {
+  it("should include converted options in __endpoint", () => {
     const cf = makeCloudFunction({
-      provider: 'mock.provider',
-      eventType: 'mock.event',
-      service: 'service',
-      triggerResource: () => 'resource',
+      provider: "mock.provider",
+      eventType: "mock.event",
+      service: "service",
+      triggerResource: () => "resource",
       handler: () => null,
       options: {
         timeoutSeconds: 10,
-        regions: ['us-central1'],
-        memory: '128MB',
-        serviceAccount: 'foo@google.com',
-        secrets: ['MY_SECRET'],
+        regions: ["us-central1"],
+        memory: "128MB",
+        serviceAccount: "foo@google.com",
+        secrets: ["MY_SECRET"],
       },
     });
 
     expect(cf.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       timeoutSeconds: 10,
-      region: ['us-central1'],
+      region: ["us-central1"],
       availableMemoryMb: 128,
-      serviceAccountEmail: 'foo@google.com',
+      serviceAccountEmail: "foo@google.com",
       eventTrigger: {
-        eventType: 'mock.provider.mock.event',
+        eventType: "mock.provider.mock.event",
         eventFilters: {
-          resource: 'resource',
+          resource: "resource",
         },
         retry: false,
       },
-      secretEnvironmentVariables: [{ key: 'MY_SECRET' }],
+      secretEnvironmentVariables: [{ key: "MY_SECRET" }],
       labels: {},
     });
   });
 
-  it('should set retry given failure policy in __endpoint', () => {
+  it("should set retry given failure policy in __endpoint", () => {
     const cf = makeCloudFunction({
-      provider: 'mock.provider',
-      eventType: 'mock.event',
-      service: 'service',
-      triggerResource: () => 'resource',
+      provider: "mock.provider",
+      eventType: "mock.event",
+      service: "service",
+      triggerResource: () => "resource",
       handler: () => null,
       options: { failurePolicy: { retry: {} } },
     });
 
     expect(cf.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       eventTrigger: {
-        eventType: 'mock.provider.mock.event',
+        eventType: "mock.provider.mock.event",
         eventFilters: {
-          resource: 'resource',
+          resource: "resource",
         },
         retry: true,
       },
@@ -151,86 +140,98 @@ describe('makeCloudFunction', () => {
     });
   });
 
-  it('should setup a scheduleTrigger in __endpoint given a schedule', () => {
+  it("should setup a scheduleTrigger in __endpoint given a schedule", () => {
     const schedule = {
-      schedule: 'every 5 minutes',
+      schedule: "every 5 minutes",
       retryConfig: { retryCount: 3 },
-      timeZone: 'America/New_York',
+      timeZone: "America/New_York",
     };
     const cf = makeCloudFunction({
-      provider: 'mock.provider',
-      eventType: 'mock.event',
-      service: 'service',
-      triggerResource: () => 'resource',
+      provider: "mock.provider",
+      eventType: "mock.event",
+      service: "service",
+      triggerResource: () => "resource",
       handler: () => null,
       options: {
         schedule,
       },
     });
     expect(cf.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
-      scheduleTrigger: schedule,
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
+      scheduleTrigger: {
+        ...schedule,
+        retryConfig: {
+          ...schedule.retryConfig,
+          maxBackoffDuration: RESET_VALUE,
+          maxDoublings: RESET_VALUE,
+          maxRetryDuration: RESET_VALUE,
+          minBackoffDuration: RESET_VALUE,
+        },
+      },
       labels: {},
     });
   });
 
-  it('should construct the right context for event', () => {
-    const args: any = _.assign({}, cloudFunctionArgs, {
+  it("should construct the right context for event", () => {
+    const args: any = {
+      ...cloudFunctionArgs,
       handler: (data: any, context: EventContext) => context,
-    });
+    };
     const cf = makeCloudFunction(args);
     const test: Event = {
       context: {
-        eventId: '00000',
-        timestamp: '2016-11-04T21:29:03.496Z',
-        eventType: 'provider.event',
+        eventId: "00000",
+        timestamp: "2016-11-04T21:29:03.496Z",
+        eventType: "provider.event",
         resource: {
-          service: 'provider',
-          name: 'resource',
+          service: "provider",
+          name: "resource",
         },
       },
-      data: 'data',
+      data: "data",
     };
 
     return expect(cf(test.data, test.context)).to.eventually.deep.equal({
-      eventId: '00000',
-      timestamp: '2016-11-04T21:29:03.496Z',
-      eventType: 'provider.event',
+      eventId: "00000",
+      timestamp: "2016-11-04T21:29:03.496Z",
+      eventType: "provider.event",
       resource: {
-        service: 'provider',
-        name: 'resource',
+        service: "provider",
+        name: "resource",
       },
       params: {},
     });
   });
 
-  it('should throw error when context.params accessed in handler environment', () => {
-    const args: any = _.assign({}, cloudFunctionArgs, {
+  it("should throw error when context.params accessed in handler environment", () => {
+    const args: any = {
+      ...cloudFunctionArgs,
       handler: (data: any, context: EventContext) => context,
       triggerResource: () => null,
-    });
+    };
     const cf = makeCloudFunction(args);
     const test: Event = {
       context: {
-        eventId: '00000',
-        timestamp: '2016-11-04T21:29:03.496Z',
-        eventType: 'provider.event',
+        eventId: "00000",
+        timestamp: "2016-11-04T21:29:03.496Z",
+        eventType: "provider.event",
         resource: {
-          service: 'provider',
-          name: 'resource',
+          service: "provider",
+          name: "resource",
         },
       },
-      data: 'test data',
+      data: "test data",
     };
 
     return cf(test.data, test.context).then((result) => {
       expect(result).to.deep.equal({
-        eventId: '00000',
-        timestamp: '2016-11-04T21:29:03.496Z',
-        eventType: 'provider.event',
+        eventId: "00000",
+        timestamp: "2016-11-04T21:29:03.496Z",
+        eventType: "provider.event",
         resource: {
-          service: 'provider',
-          name: 'resource',
+          service: "provider",
+          name: "resource",
         },
       });
       expect(() => result.params).to.throw(Error);
@@ -238,46 +239,44 @@ describe('makeCloudFunction', () => {
   });
 });
 
-describe('makeParams', () => {
+describe("makeParams", () => {
   const args: MakeCloudFunctionArgs<any> = {
-    provider: 'provider',
-    eventType: 'event',
-    service: 'service',
-    triggerResource: () => 'projects/_/instances/pid/ref/{foo}/nested/{bar}',
+    provider: "provider",
+    eventType: "event",
+    service: "service",
+    triggerResource: () => "projects/_/instances/pid/ref/{foo}/nested/{bar}",
     handler: (data, context) => context.params,
-    legacyEventType: 'legacyEvent',
+    legacyEventType: "legacyEvent",
   };
   const cf = makeCloudFunction(args);
 
-  it('should construct params from the event resource of events', () => {
+  it("should construct params from the event resource of events", () => {
     const testEvent: Event = {
       context: {
-        eventId: '111',
-        timestamp: '2016-11-04T21:29:03.496Z',
+        eventId: "111",
+        timestamp: "2016-11-04T21:29:03.496Z",
         resource: {
-          service: 'service',
-          name: 'projects/_/instances/pid/ref/a/nested/b',
+          service: "service",
+          name: "projects/_/instances/pid/ref/a/nested/b",
         },
-        eventType: 'event',
+        eventType: "event",
       },
-      data: 'data',
+      data: "data",
     };
 
-    return expect(
-      cf(testEvent.data, testEvent.context)
-    ).to.eventually.deep.equal({
-      foo: 'a',
-      bar: 'b',
+    return expect(cf(testEvent.data, testEvent.context)).to.eventually.deep.equal({
+      foo: "a",
+      bar: "b",
     });
   });
 });
 
-describe('makeAuth and makeAuthType', () => {
+describe("makeAuth and makeAuthType", () => {
   const args: MakeCloudFunctionArgs<any> = {
-    provider: 'google.firebase.database',
-    eventType: 'event',
-    service: 'service',
-    triggerResource: () => 'projects/_/instances/pid/ref/{foo}/nested/{bar}',
+    provider: "google.firebase.database",
+    eventType: "event",
+    service: "service",
+    triggerResource: () => "projects/_/instances/pid/ref/{foo}/nested/{bar}",
     handler: (data, context) => {
       return {
         auth: context.auth,
@@ -287,9 +286,9 @@ describe('makeAuth and makeAuthType', () => {
   };
   const cf = makeCloudFunction(args);
 
-  it('should construct correct auth and authType for admin user', () => {
+  it("should construct correct auth and authType for admin user", () => {
     const testEvent = {
-      data: 'data',
+      data: "data",
       context: {
         auth: {
           admin: true,
@@ -297,17 +296,15 @@ describe('makeAuth and makeAuthType', () => {
       },
     };
 
-    return expect(
-      cf(testEvent.data, testEvent.context)
-    ).to.eventually.deep.equal({
+    return expect(cf(testEvent.data, testEvent.context)).to.eventually.deep.equal({
       auth: undefined,
-      authType: 'ADMIN',
+      authType: "ADMIN",
     });
   });
 
-  it('should construct correct auth and authType for unauthenticated user', () => {
+  it("should construct correct auth and authType for unauthenticated user", () => {
     const testEvent = {
-      data: 'data',
+      data: "data",
       context: {
         auth: {
           admin: false,
@@ -315,41 +312,37 @@ describe('makeAuth and makeAuthType', () => {
       },
     };
 
-    return expect(
-      cf(testEvent.data, testEvent.context)
-    ).to.eventually.deep.equal({
+    return expect(cf(testEvent.data, testEvent.context)).to.eventually.deep.equal({
       auth: null,
-      authType: 'UNAUTHENTICATED',
+      authType: "UNAUTHENTICATED",
     });
   });
 
-  it('should construct correct auth and authType for a user', () => {
+  it("should construct correct auth and authType for a user", () => {
     const testEvent = {
-      data: 'data',
+      data: "data",
       context: {
         auth: {
           admin: false,
           variable: {
-            uid: 'user',
-            provider: 'google',
+            uid: "user",
+            provider: "google",
             token: {
-              sub: 'user',
+              sub: "user",
             },
           },
         },
       },
     };
 
-    return expect(
-      cf(testEvent.data, testEvent.context)
-    ).to.eventually.deep.equal({
+    return expect(cf(testEvent.data, testEvent.context)).to.eventually.deep.equal({
       auth: {
-        uid: 'user',
+        uid: "user",
         token: {
-          sub: 'user',
+          sub: "user",
         },
       },
-      authType: 'USER',
+      authType: "USER",
     });
   });
 });
diff --git a/spec/v1/config.spec.ts b/spec/v1/config.spec.ts
index 8341d6a34..67bd920db 100644
--- a/spec/v1/config.spec.ts
+++ b/spec/v1/config.spec.ts
@@ -20,22 +20,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as fs from 'fs';
-import * as process from 'process';
-import Sinon = require('sinon');
+import { expect } from "chai";
+import * as fs from "fs";
+import * as process from "process";
+import Sinon = require("sinon");
 
-import * as config from '../../src/config';
+import { config, resetCache } from "../../src/v1/config";
 
-describe('config()', () => {
+describe("config()", () => {
   let readFileSync: Sinon.SinonStub;
   let cwdStub: Sinon.SinonStub;
 
   before(() => {
-    readFileSync = Sinon.stub(fs, 'readFileSync');
-    readFileSync.throws('Unexpected call');
-    cwdStub = Sinon.stub(process, 'cwd');
-    cwdStub.returns('/srv');
+    readFileSync = Sinon.stub(fs, "readFileSync");
+    readFileSync.throws("Unexpected call");
+    cwdStub = Sinon.stub(process, "cwd");
+    cwdStub.returns("/srv");
   });
 
   after(() => {
@@ -43,97 +43,31 @@ describe('config()', () => {
   });
 
   afterEach(() => {
-    delete config.config.singleton;
-    (config as any).firebaseConfigCache = null;
+    resetCache();
     delete process.env.FIREBASE_CONFIG;
     delete process.env.CLOUD_RUNTIME_CONFIG;
     delete process.env.K_CONFIGURATION;
   });
 
-  it('will never load in GCFv2', () => {
+  it("will never load in GCFv2", () => {
     const json = JSON.stringify({
-      foo: 'bar',
+      foo: "bar",
       firebase: {},
     });
-    readFileSync
-      .withArgs('/srv/.runtimeconfig.json')
-      .returns(Buffer.from(json));
+    readFileSync.withArgs("/srv/.runtimeconfig.json").returns(Buffer.from(json));
 
-    process.env.K_CONFIGURATION = 'my-service';
-    expect(() => config.config()).to.throw(
-      Error,
-      /transition to using environment variables/
-    );
+    process.env.K_CONFIGURATION = "my-service";
+    expect(config).to.throw(Error, /transition to using environment variables/);
   });
 
-  it('loads config values from .runtimeconfig.json', () => {
+  it("loads config values from .runtimeconfig.json", () => {
     const json = JSON.stringify({
-      foo: 'bar',
+      foo: "bar",
       firebase: {},
     });
-    readFileSync
-      .withArgs('/srv/.runtimeconfig.json')
-      .returns(Buffer.from(json));
-    const loaded = config.config();
-    expect(loaded).to.not.have.property('firebase');
-    expect(loaded).to.have.property('foo', 'bar');
-  });
-
-  it('does not provide firebase config if .runtimeconfig.json not invalid', () => {
-    readFileSync.withArgs('/srv/.runtimeconfig.json').returns('invalid JSON');
-    expect(config.firebaseConfig()).to.be.null;
-  });
-
-  it('does not provide firebase config if .ruuntimeconfig.json has no firebase property', () => {
-    readFileSync
-      .withArgs('/srv/.runtimeconfig.json')
-      .returns(Buffer.from('{}'));
-    expect(config.firebaseConfig()).to.be.null;
-  });
-
-  it('loads Firebase configs from FIREBASE_CONFIG env variable', () => {
-    process.env.FIREBASE_CONFIG = JSON.stringify({
-      databaseURL: 'foo@firebaseio.com',
-    });
-    expect(config.firebaseConfig()).to.have.property(
-      'databaseURL',
-      'foo@firebaseio.com'
-    );
-  });
-
-  it('loads Firebase configs from FIREBASE_CONFIG env variable pointing to a file', () => {
-    const oldEnv = process.env;
-    (process as any).env = {
-      ...oldEnv,
-      FIREBASE_CONFIG: '.firebaseconfig.json',
-    };
-    try {
-      readFileSync.returns(
-        Buffer.from('{"databaseURL": "foo@firebaseio.com"}')
-      );
-      expect(config.firebaseConfig()).to.have.property(
-        'databaseURL',
-        'foo@firebaseio.com'
-      );
-    } finally {
-      (process as any).env = oldEnv;
-    }
-  });
-
-  it('accepts alternative locations for config file', () => {
-    process.env.CLOUD_RUNTIME_CONFIG = 'another.json';
-    const json = JSON.stringify({ foo: 'bar', firebase: {} });
-    readFileSync.withArgs('another.json').returns(Buffer.from(json));
-    expect(config.firebaseConfig()).to.not.be.null;
-    expect(config.config()).to.have.property('foo', 'bar');
-  });
-
-  it('accepts full JSON in env.CLOUD_RUNTIME_CONFIG', () => {
-    process.env.CLOUD_RUNTIME_CONFIG = JSON.stringify({
-      foo: 'bar',
-      firebase: {},
-    });
-    expect(config.firebaseConfig()).to.not.be.null;
-    expect(config.config()).to.have.property('foo', 'bar');
+    readFileSync.withArgs("/srv/.runtimeconfig.json").returns(Buffer.from(json));
+    const loaded = config();
+    expect(loaded).to.not.have.property("firebase");
+    expect(loaded).to.have.property("foo", "bar");
   });
 });
diff --git a/spec/v1/function-builder.spec.ts b/spec/v1/function-builder.spec.ts
index 8e01cd87a..da041e8f5 100644
--- a/spec/v1/function-builder.spec.ts
+++ b/spec/v1/function-builder.spec.ts
@@ -20,248 +20,270 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
+import { expect } from "chai";
+import { clearParams, defineSecret } from "../../src/params";
 
-import * as functions from '../../src';
+import * as functions from "../../src/v1";
+import { ResetValue } from "../../src/common/options";
 
-describe('FunctionBuilder', () => {
+describe("FunctionBuilder", () => {
   before(() => {
-    process.env.GCLOUD_PROJECT = 'not-a-project';
+    process.env.GCLOUD_PROJECT = "not-a-project";
   });
 
   after(() => {
     delete process.env.GCLOUD_PROJECT;
   });
 
-  it('should allow supported region to be set', () => {
+  it("should allow supported region to be set", () => {
     const fn = functions
-      .region('us-east1')
+      .region("us-east1")
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
+    expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
   });
 
-  it('should allow multiple supported regions to be set', () => {
+  it("should allow multiple supported regions to be set", () => {
     const fn = functions
-      .region('us-east1', 'us-central1')
+      .region("us-east1", "us-central1")
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.regions).to.deep.equal(['us-east1', 'us-central1']);
+    expect(fn.__endpoint.region).to.deep.equal(["us-east1", "us-central1"]);
   });
 
-  it('should allow all supported regions to be set', () => {
+  it("should allow all supported regions to be set", () => {
     const fn = functions
       .region(
-        'us-central1',
-        'us-east1',
-        'us-east4',
-        'europe-west1',
-        'europe-west2',
-        'europe-west3',
-        'asia-east2',
-        'asia-northeast1'
+        "us-central1",
+        "us-east1",
+        "us-east4",
+        "europe-west1",
+        "europe-west2",
+        "europe-west3",
+        "asia-east2",
+        "asia-northeast1"
       )
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.regions).to.deep.equal([
-      'us-central1',
-      'us-east1',
-      'us-east4',
-      'europe-west1',
-      'europe-west2',
-      'europe-west3',
-      'asia-east2',
-      'asia-northeast1',
+    expect(fn.__endpoint.region).to.deep.equal([
+      "us-central1",
+      "us-east1",
+      "us-east4",
+      "europe-west1",
+      "europe-west2",
+      "europe-west3",
+      "asia-east2",
+      "asia-northeast1",
     ]);
   });
 
-  it('should allow valid runtime options to be set', () => {
+  it("should allow valid runtime options to be set", () => {
     const fn = functions
       .runWith({
         timeoutSeconds: 90,
         failurePolicy: { retry: {} },
-        memory: '256MB',
+        memory: "256MB",
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-    expect(fn.__trigger.timeout).to.deep.equal('90s');
-    expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} });
+    expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
+    expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
+    expect(fn.__endpoint.eventTrigger.retry).to.deep.equal(true);
+  });
+
+  it("should allow SecretParams in the secrets array and convert them", () => {
+    const sp = defineSecret("API_KEY");
+    const fn = functions
+      .runWith({
+        secrets: [sp],
+      })
+      .auth.user()
+      .onCreate((user) => user);
+
+    expect(fn.__endpoint.secretEnvironmentVariables).to.deep.equal([
+      {
+        key: "API_KEY",
+      },
+    ]);
+
+    clearParams();
   });
 
   it("should apply a default failure policy if it's aliased with `true`", () => {
     const fn = functions
       .runWith({
         failurePolicy: true,
-        memory: '256MB',
+        memory: "256MB",
         timeoutSeconds: 90,
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.failurePolicy).to.deep.equal({ retry: {} });
+    expect(fn.__endpoint.eventTrigger.retry).to.deep.equal(true);
   });
 
-  it('should allow both supported region and valid runtime options to be set', () => {
+  it("should allow both supported region and valid runtime options to be set", () => {
     const fn = functions
-      .region('europe-west2')
+      .region("europe-west2")
       .runWith({
         timeoutSeconds: 90,
-        memory: '256MB',
+        memory: "256MB",
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.regions).to.deep.equal(['europe-west2']);
-    expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-    expect(fn.__trigger.timeout).to.deep.equal('90s');
+    expect(fn.__endpoint.region).to.deep.equal(["europe-west2"]);
+    expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
+    expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
   });
 
-  it('should allow both valid runtime options and supported region to be set in reverse order', () => {
+  it("should allow both valid runtime options and supported region to be set in reverse order", () => {
     const fn = functions
       .runWith({
         timeoutSeconds: 90,
-        memory: '256MB',
+        memory: "256MB",
       })
-      .region('europe-west1')
+      .region("europe-west1")
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.regions).to.deep.equal(['europe-west1']);
-    expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-    expect(fn.__trigger.timeout).to.deep.equal('90s');
+    expect(fn.__endpoint.region).to.deep.equal(["europe-west1"]);
+    expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
+    expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
   });
 
-  it('should fail if supported region but invalid runtime options are set (reverse order)', () => {
+  it("should fail if supported region but invalid runtime options are set (reverse order)", () => {
     expect(() => {
-      functions
-        .region('asia-northeast1')
-        .runWith({ timeoutSeconds: 600, memory: '256MB' });
-    }).to.throw(Error, 'TimeoutSeconds');
+      functions.region("asia-northeast1").runWith({ timeoutSeconds: 600, memory: "256MB" });
+    }).to.throw(Error, "TimeoutSeconds");
   });
 
-  it('should throw an error if user chooses a failurePolicy which is neither an object nor a boolean', () => {
+  it("should throw an error if user chooses a failurePolicy which is neither an object nor a boolean", () => {
     expect(() =>
       functions.runWith({
-        failurePolicy: (1234 as unknown) as functions.RuntimeOptions['failurePolicy'],
+        failurePolicy: 1234 as unknown as functions.RuntimeOptions["failurePolicy"],
       })
-    ).to.throw(Error, 'failurePolicy must be a boolean or an object');
+    ).to.throw(Error, "failurePolicy must be a boolean or an object");
   });
 
-  it('should throw an error if user chooses a failurePolicy.retry which is not an object', () => {
+  it("should throw an error if user chooses a failurePolicy.retry which is not an object", () => {
     expect(() =>
       functions.runWith({
-        failurePolicy: { retry: (1234 as unknown) as object },
+        failurePolicy: { retry: 1234 as unknown as never },
       })
-    ).to.throw(Error, 'failurePolicy.retry');
+    ).to.throw(Error, "failurePolicy.retry");
   });
 
-  it('should throw an error if user chooses an invalid memory allocation', () => {
+  it("should throw an error if user chooses an invalid memory allocation", () => {
     expect(() => {
       return functions.runWith({
-        memory: 'unsupported',
+        memory: "unsupported",
       } as any);
-    }).to.throw(Error, 'memory');
+    }).to.throw(Error, "memory");
 
     expect(() => {
-      return functions.region('us-east1').runWith({
-        memory: 'unsupported',
+      return functions.region("us-east1").runWith({
+        memory: "unsupported",
       } as any);
-    }).to.throw(Error, 'memory');
+    }).to.throw(Error, "memory");
   });
 
-  it('should throw an error if user chooses an invalid timeoutSeconds', () => {
+  it("should throw an error if user chooses an invalid timeoutSeconds", () => {
     expect(() => {
       return functions.runWith({
         timeoutSeconds: 1000000,
       } as any);
-    }).to.throw(Error, 'TimeoutSeconds');
+    }).to.throw(Error, "TimeoutSeconds");
 
     expect(() => {
-      return functions.region('asia-east2').runWith({
+      return functions.region("asia-east2").runWith({
         timeoutSeconds: 1000000,
       } as any);
-    }).to.throw(Error, 'TimeoutSeconds');
+    }).to.throw(Error, "TimeoutSeconds");
   });
 
-  it('should throw an error if user chooses no region when using .region()', () => {
+  it("should throw an error if user chooses no region when using .region()", () => {
     expect(() => {
       return functions.region();
-    }).to.throw(Error, 'at least one region');
+    }).to.throw(Error, "at least one region");
 
     expect(() => {
       return functions.region().runWith({
         timeoutSeconds: 500,
       } as any);
-    }).to.throw(Error, 'at least one region');
+    }).to.throw(Error, "at least one region");
   });
 
-  it('should allow a ingressSettings to be set', () => {
+  it("should allow a ingressSettings to be set", () => {
     const fn = functions
-      .runWith({ ingressSettings: 'ALLOW_INTERNAL_ONLY' })
-      .https.onRequest(() => {});
+      .runWith({ ingressSettings: "ALLOW_INTERNAL_ONLY" })
+      .https.onRequest(() => undefined);
 
-    expect(fn.__trigger.ingressSettings).to.equal('ALLOW_INTERNAL_ONLY');
+    expect(fn.__endpoint.ingressSettings).to.equal("ALLOW_INTERNAL_ONLY");
   });
 
-  it('should throw an error if user chooses an invalid ingressSettings', () => {
+  it("should throw an error if user chooses an invalid ingressSettings", () => {
     expect(() => {
       return functions.runWith({
-        ingressSettings: 'INVALID_OPTION',
+        ingressSettings: "INVALID_OPTION",
       } as any);
     }).to.throw(
       Error,
-      `The only valid ingressSettings values are: ${functions.INGRESS_SETTINGS_OPTIONS.join(
-        ','
-      )}`
+      `The only valid ingressSettings values are: ${functions.INGRESS_SETTINGS_OPTIONS.join(",")}`
     );
   });
 
-  it('should allow a vpcConnector to be set', () => {
+  it("should allow a vpcConnector to be set", () => {
     const fn = functions
       .runWith({
-        vpcConnector: 'test-connector',
+        vpcConnector: "test-connector",
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.vpcConnector).to.equal('test-connector');
+    if (!(fn.__endpoint.vpc instanceof ResetValue)) {
+      expect(fn.__endpoint.vpc.connector).to.equal("test-connector");
+    } else {
+      expect.fail("__endpoint.vpc unexpectedly set to RESET_VALUE");
+    }
   });
 
-  it('should allow a vpcConnectorEgressSettings to be set', () => {
+  it("should allow a vpcConnectorEgressSettings to be set", () => {
     const fn = functions
       .runWith({
-        vpcConnector: 'test-connector',
-        vpcConnectorEgressSettings: 'PRIVATE_RANGES_ONLY',
+        vpcConnector: "test-connector",
+        vpcConnectorEgressSettings: "PRIVATE_RANGES_ONLY",
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.vpcConnectorEgressSettings).to.equal(
-      'PRIVATE_RANGES_ONLY'
-    );
+    if (!(fn.__endpoint.vpc instanceof ResetValue)) {
+      expect(fn.__endpoint.vpc.egressSettings).to.equal("PRIVATE_RANGES_ONLY");
+    } else {
+      expect.fail("__endpoint.vpc unexpectedly set to RESET_VALUE");
+    }
   });
 
-  it('should throw an error if user chooses an invalid vpcConnectorEgressSettings', () => {
+  it("should throw an error if user chooses an invalid vpcConnectorEgressSettings", () => {
     expect(() => {
       return functions.runWith({
-        vpcConnector: 'test-connector',
-        vpcConnectorEgressSettings: 'INCORRECT_OPTION',
+        vpcConnector: "test-connector",
+        vpcConnectorEgressSettings: "INCORRECT_OPTION",
       } as any);
     }).to.throw(
       Error,
       `The only valid vpcConnectorEgressSettings values are: ${functions.VPC_EGRESS_SETTINGS_OPTIONS.join(
-        ','
+        ","
       )}`
     );
   });
 
-  it('should allow a serviceAccount to be set as-is', () => {
-    const serviceAccount = 'test-service-account@test.iam.gserviceaccount.com';
+  it("should allow a serviceAccount to be set as-is", () => {
+    const serviceAccount = "test-service-account@test.iam.gserviceaccount.com";
     const fn = functions
       .runWith({
         serviceAccount,
@@ -269,12 +291,11 @@ describe('FunctionBuilder', () => {
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.serviceAccountEmail).to.equal(serviceAccount);
+    expect(fn.__endpoint.serviceAccountEmail).to.equal(serviceAccount);
   });
 
-  it('should allow a serviceAccount to be set with generated service account email', () => {
-    const serviceAccount = 'test-service-account@';
-    const projectId = process.env.GCLOUD_PROJECT;
+  it("should allow a serviceAccount to be set with generated service account email", () => {
+    const serviceAccount = "test-service-account@";
     const fn = functions
       .runWith({
         serviceAccount,
@@ -282,13 +303,11 @@ describe('FunctionBuilder', () => {
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.serviceAccountEmail).to.equal(
-      `test-service-account@${projectId}.iam.gserviceaccount.com`
-    );
+    expect(fn.__endpoint.serviceAccountEmail).to.equal(`test-service-account@`);
   });
 
-  it('should set a null serviceAccountEmail if service account is set to `default`', () => {
-    const serviceAccount = 'default';
+  it("should set a null serviceAccountEmail if service account is set to `default`", () => {
+    const serviceAccount = "default";
     const fn = functions
       .runWith({
         serviceAccount,
@@ -296,11 +315,11 @@ describe('FunctionBuilder', () => {
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.serviceAccountEmail).to.be.null;
+    expect(fn.__endpoint.serviceAccountEmail).to.equal("default");
   });
 
-  it('should throw an error if serviceAccount is set to an invalid value', () => {
-    const serviceAccount = 'test-service-account';
+  it("should throw an error if serviceAccount is set to an invalid value", () => {
+    const serviceAccount = "test-service-account";
     expect(() => {
       functions.runWith({
         serviceAccount,
@@ -308,37 +327,37 @@ describe('FunctionBuilder', () => {
     }).to.throw();
   });
 
-  it('should allow setting 4GB memory option', () => {
+  it("should allow setting 4GB memory option", () => {
     const fn = functions
       .runWith({
-        memory: '4GB',
+        memory: "4GB",
       })
-      .region('europe-west1')
+      .region("europe-west1")
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.availableMemoryMb).to.deep.equal(4096);
+    expect(fn.__endpoint.availableMemoryMb).to.deep.equal(4096);
   });
 
-  it('should allow labels to be set', () => {
+  it("should allow labels to be set", () => {
     const fn = functions
       .runWith({
         labels: {
-          'valid-key': 'valid-value',
+          "valid-key": "valid-value",
         },
       })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.labels).to.deep.equal({
-      'valid-key': 'valid-value',
+    expect(fn.__endpoint.labels).to.deep.equal({
+      "valid-key": "valid-value",
     });
   });
 
-  it('should throw an error if more than 58 labels are set', () => {
+  it("should throw an error if more than 58 labels are set", () => {
     const labels = {};
     for (let i = 0; i < 59; i++) {
-      labels[`label${i}`] = 'value';
+      labels[`label${i}`] = "value";
     }
 
     expect(() =>
@@ -348,41 +367,39 @@ describe('FunctionBuilder', () => {
     ).to.throw();
   });
 
-  it('should throw an error if labels has a key that is too long', () => {
+  it("should throw an error if labels has a key that is too long", () => {
     expect(() =>
       functions.runWith({
         labels: {
-          'a-very-long-key-that-is-more-than-the-maximum-allowed-length-for-keys':
-            'value',
+          "a-very-long-key-that-is-more-than-the-maximum-allowed-length-for-keys": "value",
         },
       })
     ).to.throw();
   });
 
-  it('should throw an error if labels has key that is too short', () => {
+  it("should throw an error if labels has key that is too short", () => {
     expect(() =>
       functions.runWith({
-        labels: { '': 'value' },
+        labels: { "": "value" },
       })
     ).to.throw();
   });
 
-  it('should throw an error if labels has a value that is too long', () => {
+  it("should throw an error if labels has a value that is too long", () => {
     expect(() =>
       functions.runWith({
         labels: {
-          key:
-            'a-very-long-value-that-is-more-than-the-maximum-allowed-length-for-values',
+          key: "a-very-long-value-that-is-more-than-the-maximum-allowed-length-for-values",
         },
       })
     ).to.throw();
   });
 
-  it('should throw an error if labels has a key that contains invalid characters', () => {
+  it("should throw an error if labels has a key that contains invalid characters", () => {
     expect(() =>
       functions.runWith({
         labels: {
-          Key: 'value',
+          Key: "value",
         },
       })
     ).to.throw();
@@ -390,7 +407,7 @@ describe('FunctionBuilder', () => {
     expect(() =>
       functions.runWith({
         labels: {
-          'key ': 'value',
+          "key ": "value",
         },
       })
     ).to.throw();
@@ -398,17 +415,17 @@ describe('FunctionBuilder', () => {
     expect(() =>
       functions.runWith({
         labels: {
-          '1key': 'value',
+          "1key": "value",
         },
       })
     ).to.throw();
   });
 
-  it('should throw an error if labels has a value that contains invalid characters', () => {
+  it("should throw an error if labels has a value that contains invalid characters", () => {
     expect(() =>
       functions.runWith({
         labels: {
-          key: 'Value',
+          key: "Value",
         },
       })
     ).to.throw();
@@ -416,17 +433,17 @@ describe('FunctionBuilder', () => {
     expect(() =>
       functions.runWith({
         labels: {
-          'key ': 'va lue',
+          "key ": "va lue",
         },
       })
     ).to.throw();
   });
 
-  it('should throw an error if a label key starts with a reserved namespace', () => {
+  it("should throw an error if a label key starts with a reserved namespace", () => {
     expect(() =>
       functions.runWith({
         labels: {
-          'firebase-foo': 'value',
+          "firebase-foo": "value",
         },
       })
     ).to.throw();
@@ -434,83 +451,114 @@ describe('FunctionBuilder', () => {
     expect(() =>
       functions.runWith({
         labels: {
-          'deployment-bar': 'value',
+          "deployment-bar": "value",
         },
       })
     ).to.throw();
   });
 
-  it('should throw an error if invoker is an empty string', () => {
+  it("should throw an error if invoker is an empty string", () => {
     expect(() =>
       functions.runWith({
-        invoker: '',
+        invoker: "",
       })
     ).to.throw();
   });
 
-  it('should throw an error if invoker is an empty array', () => {
+  it("should throw an error if invoker is an empty array", () => {
     expect(() =>
       functions.runWith({
-        invoker: [''],
+        invoker: [""],
       })
     ).to.throw();
   });
 
-  it('should throw an error if invoker has an empty string', () => {
+  it("should throw an error if invoker has an empty string", () => {
     expect(() =>
       functions.runWith({
-        invoker: ['service-account1', '', 'service-account2'],
+        invoker: ["service-account1", "", "service-account2"],
       })
     ).to.throw();
   });
 
-  it('should throw an error if public identifier is in the invoker array', () => {
+  it("should throw an error if public identifier is in the invoker array", () => {
     expect(() =>
       functions.runWith({
-        invoker: ['service-account1', 'public', 'service-account2'],
+        invoker: ["service-account1", "public", "service-account2"],
       })
     ).to.throw();
   });
 
-  it('should throw an error if private identifier is in the invoker array', () => {
+  it("should throw an error if private identifier is in the invoker array", () => {
     expect(() =>
       functions.runWith({
-        invoker: ['service-account1', 'private', 'service-account2'],
+        invoker: ["service-account1", "private", "service-account2"],
       })
     ).to.throw();
   });
 
-  it('should allow valid secret config expressed using short form', () => {
-    const secrets = ['API_KEY'];
+  it("should allow valid secret config expressed using short form", () => {
+    const secrets = ["API_KEY"];
     const fn = functions
       .runWith({ secrets })
       .auth.user()
       .onCreate((user) => user);
 
-    expect(fn.__trigger.secrets).to.deep.equal(secrets);
+    expect(fn.__endpoint.secretEnvironmentVariables).to.deep.equal([
+      {
+        key: "API_KEY",
+      },
+    ]);
   });
 
-  it('should throw error given secrets expressed with full resource name', () => {
+  it("should throw error given secrets expressed with full resource name", () => {
+    const sp = defineSecret("projects/my-project/secrets/API_KEY");
+
     expect(() =>
       functions.runWith({
-        secrets: ['projects/my-project/secrets/API_KEY'],
+        secrets: ["projects/my-project/secrets/API_KEY"],
       })
     ).to.throw();
+
+    expect(() =>
+      functions.runWith({
+        secrets: [sp],
+      })
+    ).to.throw();
+    clearParams();
   });
 
-  it('should throw error given invalid secret config', () => {
+  it("should throw error given invalid secret config", () => {
+    const sp = defineSecret("ABC/efg");
+
     expect(() =>
       functions.runWith({
-        secrets: ['ABC/efg'],
+        secrets: ["ABC/efg"],
       })
     ).to.throw();
+
+    expect(() =>
+      functions.runWith({
+        secrets: [sp],
+      })
+    ).to.throw();
+    clearParams();
   });
 
-  it('should throw error given invalid secret with versions', () => {
+  it("should throw error given invalid secret with versions", () => {
+    const sp = defineSecret("ABC@3");
+
+    expect(() =>
+      functions.runWith({
+        secrets: ["ABC@3"],
+      })
+    ).to.throw();
+
     expect(() =>
       functions.runWith({
-        secrets: ['ABC@3'],
+        secrets: [sp],
       })
     ).to.throw();
+    clearParams();
   });
 });
diff --git a/spec/v1/providers/analytics.spec.input.ts b/spec/v1/providers/analytics.spec.input.ts
index b4a6505f5..9edb62a4e 100644
--- a/spec/v1/providers/analytics.spec.input.ts
+++ b/spec/v1/providers/analytics.spec.input.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 /* tslint:disable:max-line-length */
-import { AnalyticsEvent } from '../../../src/providers/analytics';
+import { AnalyticsEvent } from "../../../src/v1/providers/analytics";
 
 // A payload, as it might arrive over the wire. Every possible field is filled out at least once.
 export const fullPayload = JSON.parse(`{
@@ -130,62 +130,62 @@ export const fullPayload = JSON.parse(`{
 
 // The event data that we expect would be constructed if the payload above were to arrive.
 export const data: AnalyticsEvent = {
-  reportingDate: '20170202',
-  name: 'Loaded_In_Background',
+  reportingDate: "20170202",
+  name: "Loaded_In_Background",
   params: {
-    build: '1350',
+    build: "1350",
     calls_remaining: 10,
     fraction_calls_dropped: 0.0123456,
     average_call_rating: 4.5,
   },
-  logTime: '2017-02-02T23:06:26.124Z',
-  previousLogTime: '2017-02-02T23:01:19.797Z',
+  logTime: "2017-02-02T23:06:26.124Z",
+  previousLogTime: "2017-02-02T23:01:19.797Z",
   valueInUSD: 1234.5,
   user: {
-    userId: 'abcdefghijklmnop!',
+    userId: "abcdefghijklmnop!",
     appInfo: {
-      appId: 'com.mobileday.MobileDay',
-      appInstanceId: 'E3C9939401814B9B954725A740B8C7BC',
-      appPlatform: 'IOS',
-      appStore: 'iTunes',
-      appVersion: '5.2.0',
+      appId: "com.mobileday.MobileDay",
+      appInstanceId: "E3C9939401814B9B954725A740B8C7BC",
+      appPlatform: "IOS",
+      appStore: "iTunes",
+      appVersion: "5.2.0",
     },
     bundleInfo: {
       bundleSequenceId: 6034,
       serverTimestampOffset: 371,
     },
     deviceInfo: {
-      deviceCategory: 'mobile',
-      deviceModel: 'iPhone7,2',
+      deviceCategory: "mobile",
+      deviceModel: "iPhone7,2",
       deviceTimeZoneOffsetSeconds: -21600,
-      mobileBrandName: 'Apple',
-      mobileMarketingName: 'iPhone 6',
-      mobileModelName: 'iPhone 6',
-      platformVersion: '10.2.1',
-      userDefaultLanguage: 'en-us',
-      deviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370',
-      resettableDeviceId: '599F9C00-92DC-4B5C-9464-7971F01F8370',
+      mobileBrandName: "Apple",
+      mobileMarketingName: "iPhone 6",
+      mobileModelName: "iPhone 6",
+      platformVersion: "10.2.1",
+      userDefaultLanguage: "en-us",
+      deviceId: "599F9C00-92DC-4B5C-9464-7971F01F8370",
+      resettableDeviceId: "599F9C00-92DC-4B5C-9464-7971F01F8370",
       limitedAdTracking: true,
     },
-    firstOpenTime: '2016-04-28T15:00:35.819Z',
+    firstOpenTime: "2016-04-28T15:00:35.819Z",
     geoInfo: {
-      city: 'Plano',
-      continent: '021',
-      country: 'United States',
-      region: 'Texas',
+      city: "Plano",
+      continent: "021",
+      country: "United States",
+      region: "Texas",
     },
     userProperties: {
       build: {
-        setTime: '2017-02-02T23:06:26.090Z',
-        value: '1350',
+        setTime: "2017-02-02T23:06:26.090Z",
+        value: "1350",
       },
       calls_remaining: {
-        setTime: '2017-02-02T23:06:26.094Z',
-        value: '10',
+        setTime: "2017-02-02T23:06:26.094Z",
+        value: "10",
       },
       version: {
-        setTime: '2017-02-02T23:06:26.085Z',
-        value: '5.2.0',
+        setTime: "2017-02-02T23:06:26.085Z",
+        value: "5.2.0",
       },
     },
   },
diff --git a/spec/v1/providers/analytics.spec.ts b/spec/v1/providers/analytics.spec.ts
index ead39554f..d7172360a 100644
--- a/spec/v1/providers/analytics.spec.ts
+++ b/spec/v1/providers/analytics.spec.ts
@@ -20,63 +20,51 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import * as functions from '../../../src';
-import { Event, EventContext } from '../../../src/cloud-functions';
-import * as analytics from '../../../src/providers/analytics';
-import * as analytics_spec_input from './analytics.spec.input';
+import * as functions from "../../../src/v1";
+import { Event } from "../../../src/v1/cloud-functions";
+import * as analytics from "../../../src/v1/providers/analytics";
+import * as analyticsSpecInput from "./analytics.spec.input";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
 
-describe('Analytics Functions', () => {
-  describe('EventBuilder', () => {
+describe("Analytics Functions", () => {
+  describe("EventBuilder", () => {
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
     });
 
     after(() => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
-        .analytics.event('event')
+        .analytics.event("event")
         .onLog((event) => event);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
-
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
 
-    describe('#onLog', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
-        const cloudFunction = analytics.event('first_open').onLog(() => null);
-
-        expect(cloudFunction.__trigger).to.deep.equal({
-          eventTrigger: {
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
-            resource: 'projects/project1/events/first_open',
-            service: 'app-measurement.com',
-          },
-        });
+    describe("#onLog", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
+        const cloudFunction = analytics.event("first_open").onLog(() => null);
 
         expect(cloudFunction.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           eventTrigger: {
             eventFilters: {
-              resource: 'projects/project1/events/first_open',
+              resource: "projects/project1/events/first_open",
             },
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
+            eventType: "providers/google.firebase.analytics/eventTypes/event.log",
             retry: false,
           },
           labels: {},
@@ -84,51 +72,44 @@ describe('Analytics Functions', () => {
       });
     });
 
-    describe('#dataConstructor', () => {
-      it('should handle an event with the appropriate fields', () => {
+    describe("#dataConstructor", () => {
+      it("should handle an event with the appropriate fields", () => {
         const cloudFunction = analytics
-          .event('first_open')
-          .onLog(
-            (data: analytics.AnalyticsEvent, context: EventContext) => data
-          );
+          .event("first_open")
+          .onLog((data: analytics.AnalyticsEvent) => data);
 
         // The event data delivered over the wire will be the JSON for an AnalyticsEvent:
         // https://firebase.google.com/docs/auth/admin/manage-users#retrieve_user_data
         const event: Event = {
           data: {
             userDim: {
-              userId: 'hi!',
+              userId: "hi!",
             },
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "providers/google.firebase.analytics/eventTypes/event.log",
             resource: {
-              service: 'app-measurement.com',
-              name: 'projects/project1/events/first_open',
+              service: "app-measurement.com",
+              name: "projects/project1/events/first_open",
             },
           },
         };
 
-        return expect(
-          cloudFunction(event.data, event.context)
-        ).to.eventually.deep.equal({
+        return expect(cloudFunction(event.data, event.context)).to.eventually.deep.equal({
           params: {},
           user: {
-            userId: 'hi!',
+            userId: "hi!",
             userProperties: {},
           },
         });
       });
 
-      it('should remove xValues', () => {
+      it("should remove xValues", () => {
         const cloudFunction = analytics
-          .event('first_open')
-          .onLog(
-            (data: analytics.AnalyticsEvent, context: EventContext) => data
-          );
+          .event("first_open")
+          .onLog((data: analytics.AnalyticsEvent) => data);
 
         // Incoming events will have four kinds of "xValue" fields: "intValue",
         // "stringValue", "doubleValue" and "floatValue". We expect those to get
@@ -137,14 +118,14 @@ describe('Analytics Functions', () => {
           data: {
             eventDim: [
               {
-                date: '20170202',
-                name: 'Loaded_In_Background',
+                date: "20170202",
+                name: "Loaded_In_Background",
                 params: {
                   build: {
-                    stringValue: '1350',
+                    stringValue: "1350",
                   },
                   calls_remaining: {
-                    intValue: '10',
+                    intValue: "10",
                   },
                   goats_teleported: {
                     doubleValue: 1.1,
@@ -159,31 +140,28 @@ describe('Analytics Functions', () => {
               userProperties: {
                 foo: {
                   value: {
-                    stringValue: 'bar',
+                    stringValue: "bar",
                   },
                 },
               },
             },
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "providers/google.firebase.analytics/eventTypes/event.log",
             resource: {
-              service: 'app-measurement.com',
-              name: 'projects/project1/events/first_open',
+              service: "app-measurement.com",
+              name: "projects/project1/events/first_open",
             },
           },
         };
 
-        return expect(
-          cloudFunction(event.data, event.context)
-        ).to.eventually.deep.equal({
-          reportingDate: '20170202',
-          name: 'Loaded_In_Background',
+        return expect(cloudFunction(event.data, event.context)).to.eventually.deep.equal({
+          reportingDate: "20170202",
+          name: "Loaded_In_Background",
           params: {
-            build: '1350',
+            build: "1350",
             calls_remaining: 10,
             goats_teleported: 1.1,
             boat_boyancy: 133.7,
@@ -191,33 +169,33 @@ describe('Analytics Functions', () => {
           user: {
             userProperties: {
               foo: {
-                value: 'bar',
+                value: "bar",
               },
             },
           },
         });
       });
 
-      it('should change microsecond timestamps to ISO strings, and offsets to millis', () => {
+      it("should change microsecond timestamps to ISO strings, and offsets to millis", () => {
         const cloudFunction = analytics
-          .event('first_open')
+          .event("first_open")
           .onLog((data: analytics.AnalyticsEvent) => data);
 
         const event: Event = {
           data: {
             eventDim: [
               {
-                date: '20170202',
-                name: 'Loaded_In_Background',
-                timestampMicros: '1489080600000000',
-                previousTimestampMicros: '526657020000000',
+                date: "20170202",
+                name: "Loaded_In_Background",
+                timestampMicros: "1489080600000000",
+                previousTimestampMicros: "526657020000000",
               },
             ],
             userDim: {
-              firstOpenTimestampMicros: '577978620000000',
+              firstOpenTimestampMicros: "577978620000000",
               userProperties: {
                 foo: {
-                  setTimestampUsec: '514820220000000',
+                  setTimestampUsec: "514820220000000",
                 },
               },
               bundleInfo: {
@@ -226,30 +204,27 @@ describe('Analytics Functions', () => {
             },
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "providers/google.firebase.analytics/eventTypes/event.log",
             resource: {
-              service: 'app-measurement.com',
-              name: 'projects/project1/events/first_open',
+              service: "app-measurement.com",
+              name: "projects/project1/events/first_open",
             },
           },
         };
 
-        return expect(
-          cloudFunction(event.data, event.context)
-        ).to.eventually.deep.equal({
-          reportingDate: '20170202',
-          name: 'Loaded_In_Background',
+        return expect(cloudFunction(event.data, event.context)).to.eventually.deep.equal({
+          reportingDate: "20170202",
+          name: "Loaded_In_Background",
           params: {},
-          logTime: '2017-03-09T17:30:00.000Z',
-          previousLogTime: '1986-09-09T13:37:00.000Z',
+          logTime: "2017-03-09T17:30:00.000Z",
+          previousLogTime: "1986-09-09T13:37:00.000Z",
           user: {
-            firstOpenTime: '1988-04-25T13:37:00.000Z',
+            firstOpenTime: "1988-04-25T13:37:00.000Z",
             userProperties: {
               foo: {
-                setTime: '1986-04-25T13:37:00.000Z',
+                setTime: "1986-04-25T13:37:00.000Z",
               },
             },
             bundleInfo: {
@@ -259,9 +234,9 @@ describe('Analytics Functions', () => {
         });
       });
 
-      it('should populate currency fields', () => {
+      it("should populate currency fields", () => {
         const cloudFunction = analytics
-          .event('first_open')
+          .event("first_open")
           .onLog((data: analytics.AnalyticsEvent) => data);
 
         // Incoming events will have four kinds of "xValue" fields: "intValue",
@@ -277,112 +252,57 @@ describe('Analytics Functions', () => {
           data: {
             eventDim: [
               {
-                date: '20170202',
-                name: 'Loaded_In_Background',
+                date: "20170202",
+                name: "Loaded_In_Background",
                 valueInUsd: 123.4,
               },
             ],
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "providers/google.firebase.analytics/eventTypes/event.log",
             resource: {
-              service: 'app-measurement.com',
-              name: 'projects/project1/events/first_open',
+              service: "app-measurement.com",
+              name: "projects/project1/events/first_open",
             },
           },
         };
 
-        return expect(
-          cloudFunction(event.data, event.context)
-        ).to.eventually.deep.equal({
-          reportingDate: '20170202',
-          name: 'Loaded_In_Background',
+        return expect(cloudFunction(event.data, event.context)).to.eventually.deep.equal({
+          reportingDate: "20170202",
+          name: "Loaded_In_Background",
           params: {},
           valueInUSD: 123.4, // Field renamed Usd -> USD.
         });
       });
 
-      it('should recognize all the fields the payload can contain', () => {
+      it("should recognize all the fields the payload can contain", () => {
         const cloudFunction = analytics
-          .event('first_open')
+          .event("first_open")
           .onLog((data: analytics.AnalyticsEvent) => data);
         // The payload in analytics_spec_input contains all possible fields at least once.
-        const payloadData = analytics_spec_input.fullPayload.data;
-        const payloadContext = analytics_spec_input.fullPayload.context;
+        const payloadData = analyticsSpecInput.fullPayload.data;
+        const payloadContext = analyticsSpecInput.fullPayload.context;
 
-        return expect(
-          cloudFunction(payloadData, payloadContext)
-        ).to.eventually.deep.equal(analytics_spec_input.data);
-      });
-    });
-  });
-
-  describe('handler namespace', () => {
-    describe('#onLog', () => {
-      it('should return an empty trigger/endpoint', () => {
-        const cloudFunction = functions.handler.analytics.event.onLog(
-          () => null
-        );
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should handle an event with the appropriate fields', () => {
-        const cloudFunction = functions.handler.analytics.event.onLog(
-          (data: analytics.AnalyticsEvent, context: EventContext) => data
+        return expect(cloudFunction(payloadData, payloadContext)).to.eventually.deep.equal(
+          analyticsSpecInput.data
         );
-
-        // The event data delivered over the wire will be the JSON for an AnalyticsEvent:
-        // https://firebase.google.com/docs/auth/admin/manage-users#retrieve_user_data
-        const event: Event = {
-          data: {
-            userDim: {
-              userId: 'hi!',
-            },
-          },
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType:
-              'providers/google.firebase.analytics/eventTypes/event.log',
-            resource: {
-              service: 'app-measurement.com',
-              name: 'projects/project1/events/first_open',
-            },
-          },
-        };
-
-        return expect(
-          cloudFunction(event.data, event.context)
-        ).to.eventually.deep.equal({
-          params: {},
-          user: {
-            userId: 'hi!',
-            userProperties: {},
-          },
-        });
       });
     });
   });
 
-  describe('process.env.GCLOUD_PROJECT not set', () => {
-    it('should not throw if __trigger is not accessed', () => {
-      expect(() => analytics.event('event').onLog(() => null)).to.not.throw(
-        Error
-      );
+  describe("process.env.GCLOUD_PROJECT not set", () => {
+    it("should not throw if __endpoint is not accessed", () => {
+      expect(() => analytics.event("event").onLog(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when trigger is accessed', () => {
-      expect(
-        () => analytics.event('event').onLog(() => null).__trigger
-      ).to.throw(Error);
+    it("should throw when __endpoint is accessed", () => {
+      expect(() => analytics.event("event").onLog(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
-      const cf = analytics.event('event').onLog(() => null);
+    it("should not throw when #run is called", () => {
+      const cf = analytics.event("event").onLog(() => null);
 
       expect(cf.run).to.not.throw(Error);
     });
diff --git a/spec/v1/providers/auth.spec.ts b/spec/v1/providers/auth.spec.ts
index 91e394bc7..b9604c37a 100644
--- a/spec/v1/providers/auth.spec.ts
+++ b/spec/v1/providers/auth.spec.ts
@@ -20,49 +20,37 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-} from '../../../src/cloud-functions';
-import { UserRecord } from '../../../src/common/providers/identity';
-import * as functions from '../../../src/index';
-import * as auth from '../../../src/providers/auth';
-
-describe('Auth Functions', () => {
+import { expect } from "chai";
+import { UserRecord } from "../../../src/common/providers/identity";
+import * as functions from "../../../src/v1";
+import { CloudFunction, Event } from "../../../src/v1/cloud-functions";
+import * as auth from "../../../src/v1/providers/auth";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+
+describe("Auth Functions", () => {
   const event: Event = {
     data: {
       metadata: {
-        creationTime: '2016-12-15T19:37:37.059Z',
-        lastSignInTime: '2017-01-01T00:00:00.000Z',
+        creationTime: "2016-12-15T19:37:37.059Z",
+        lastSignInTime: "2017-01-01T00:00:00.000Z",
       },
     },
     context: {
-      eventId: '70172329041928',
-      timestamp: '2018-04-09T07:56:12.975Z',
-      eventType: 'providers/firebase.auth/eventTypes/user.delete',
+      eventId: "70172329041928",
+      timestamp: "2018-04-09T07:56:12.975Z",
+      eventType: "providers/firebase.auth/eventTypes/user.delete",
       resource: {
-        service: 'firebaseauth.googleapis.com',
-        name: 'projects/project1',
+        service: "firebaseauth.googleapis.com",
+        name: "projects/project1",
       },
     },
   };
 
-  describe('AuthBuilder', () => {
-    function expectedTrigger(project: string, eventType: string) {
-      return {
-        eventTrigger: {
-          resource: `projects/${project}`,
-          eventType: `providers/firebase.auth/eventTypes/${eventType}`,
-          service: 'firebaseauth.googleapis.com',
-        },
-      };
-    }
-
+  describe("AuthBuilder", () => {
     function expectedEndpoint(project: string, eventType: string) {
       return {
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         eventTrigger: {
           eventFilters: {
             resource: `projects/${project}`,
@@ -74,11 +62,11 @@ describe('Auth Functions', () => {
       };
     }
 
-    const handler = (user: UserRecord) => {
+    const handler = () => {
       return Promise.resolve();
     };
 
-    const project = 'project1';
+    const project = "project1";
 
     before(() => {
       process.env.GCLOUD_PROJECT = project;
@@ -88,73 +76,51 @@ describe('Auth Functions', () => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
         .auth.user()
         .onCreate(() => null);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
+      expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
+      expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
 
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
 
-    describe('#onCreate', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
+    describe("#onCreate", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
         const cloudFunction = auth.user().onCreate(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(project, 'user.create')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(project, 'user.create')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(project, "user.create"));
       });
     });
 
-    describe('#onDelete', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
+    describe("#onDelete", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
         const cloudFunction = auth.user().onDelete(handler);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(project, 'user.delete')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(project, 'user.delete')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(project, "user.delete"));
       });
     });
 
-    describe('beforeCreate', () => {
-      it('should create the function without options', () => {
-        const fn = auth.user().beforeCreate((u, c) => Promise.resolve());
+    describe("beforeCreate", () => {
+      it("should create the function without options", () => {
+        const fn = auth.user().beforeCreate(() => Promise.resolve());
 
-        expect(fn.__trigger).to.deep.equal({
-          labels: {},
-          blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate',
-            options: {
-              accessToken: false,
-              idToken: false,
-              refreshToken: false,
-            },
-          },
-        });
         expect(fn.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           labels: {},
           blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate',
+            eventType: "providers/cloud.auth/eventTypes/user.beforeCreate",
             options: {
               accessToken: false,
               idToken: false,
@@ -164,18 +130,18 @@ describe('Auth Functions', () => {
         });
         expect(fn.__requiredAPIs).to.deep.equal([
           {
-            api: 'identitytoolkit.googleapis.com',
-            reason: 'Needed for auth blocking functions',
+            api: "identitytoolkit.googleapis.com",
+            reason: "Needed for auth blocking functions",
           },
         ]);
       });
 
-      it('should create the function with options', () => {
+      it("should create the function with options", () => {
         const fn = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
           .auth.user({
             blockingOptions: {
@@ -183,30 +149,17 @@ describe('Auth Functions', () => {
               refreshToken: false,
             },
           })
-          .beforeCreate((u, c) => Promise.resolve());
+          .beforeCreate(() => Promise.resolve());
 
-        expect(fn.__trigger).to.deep.equal({
-          labels: {},
-          regions: ['us-east1'],
-          availableMemoryMb: 256,
-          timeout: '90s',
-          blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate',
-            options: {
-              accessToken: true,
-              idToken: false,
-              refreshToken: false,
-            },
-          },
-        });
         expect(fn.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           labels: {},
-          region: ['us-east1'],
+          region: ["us-east1"],
           availableMemoryMb: 256,
           timeoutSeconds: 90,
           blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate',
+            eventType: "providers/cloud.auth/eventTypes/user.beforeCreate",
             options: {
               accessToken: true,
               idToken: false,
@@ -216,33 +169,23 @@ describe('Auth Functions', () => {
         });
         expect(fn.__requiredAPIs).to.deep.equal([
           {
-            api: 'identitytoolkit.googleapis.com',
-            reason: 'Needed for auth blocking functions',
+            api: "identitytoolkit.googleapis.com",
+            reason: "Needed for auth blocking functions",
           },
         ]);
       });
     });
 
-    describe('beforeSignIn', () => {
-      it('should create the function without options', () => {
-        const fn = auth.user().beforeSignIn((u, c) => Promise.resolve());
+    describe("beforeSignIn", () => {
+      it("should create the function without options", () => {
+        const fn = auth.user().beforeSignIn(() => Promise.resolve());
 
-        expect(fn.__trigger).to.deep.equal({
-          labels: {},
-          blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
-            options: {
-              accessToken: false,
-              idToken: false,
-              refreshToken: false,
-            },
-          },
-        });
         expect(fn.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           labels: {},
           blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
+            eventType: "providers/cloud.auth/eventTypes/user.beforeSignIn",
             options: {
               accessToken: false,
               idToken: false,
@@ -252,18 +195,18 @@ describe('Auth Functions', () => {
         });
         expect(fn.__requiredAPIs).to.deep.equal([
           {
-            api: 'identitytoolkit.googleapis.com',
-            reason: 'Needed for auth blocking functions',
+            api: "identitytoolkit.googleapis.com",
+            reason: "Needed for auth blocking functions",
           },
         ]);
       });
 
-      it('should create the function with options', () => {
+      it("should create the function with options", () => {
         const fn = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
           .auth.user({
             blockingOptions: {
@@ -271,30 +214,17 @@ describe('Auth Functions', () => {
               refreshToken: false,
             },
           })
-          .beforeSignIn((u, c) => Promise.resolve());
+          .beforeSignIn(() => Promise.resolve());
 
-        expect(fn.__trigger).to.deep.equal({
-          labels: {},
-          regions: ['us-east1'],
-          availableMemoryMb: 256,
-          timeout: '90s',
-          blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
-            options: {
-              accessToken: true,
-              idToken: false,
-              refreshToken: false,
-            },
-          },
-        });
         expect(fn.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           labels: {},
-          region: ['us-east1'],
+          region: ["us-east1"],
           availableMemoryMb: 256,
           timeoutSeconds: 90,
           blockingTrigger: {
-            eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
+            eventType: "providers/cloud.auth/eventTypes/user.beforeSignIn",
             options: {
               accessToken: true,
               idToken: false,
@@ -304,94 +234,39 @@ describe('Auth Functions', () => {
         });
         expect(fn.__requiredAPIs).to.deep.equal([
           {
-            api: 'identitytoolkit.googleapis.com',
-            reason: 'Needed for auth blocking functions',
+            api: "identitytoolkit.googleapis.com",
+            reason: "Needed for auth blocking functions",
           },
         ]);
       });
     });
 
-    describe('#_dataConstructor', () => {
+    describe("#_dataConstructor", () => {
       let cloudFunctionDelete: CloudFunction<UserRecord>;
 
       before(() => {
-        cloudFunctionDelete = auth
-          .user()
-          .onDelete((data: UserRecord, context: EventContext) => data);
+        cloudFunctionDelete = auth.user().onDelete((data: UserRecord) => data);
       });
 
-      it('should handle wire format as of v5.0.0 of firebase-admin', () => {
-        return cloudFunctionDelete(event.data, event.context).then(
-          (data: any) => {
-            expect(data.metadata.creationTime).to.equal(
-              '2016-12-15T19:37:37.059Z'
-            );
-            expect(data.metadata.lastSignInTime).to.equal(
-              '2017-01-01T00:00:00.000Z'
-            );
-          }
-        );
-      });
-    });
-  });
-
-  describe('handler namespace', () => {
-    describe('#onCreate', () => {
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.auth.user.onCreate(() => null);
-        expect(cloudFunction.__trigger).to.deep.equal({});
-      });
-
-      it('should return an empty endpoint', () => {
-        const cloudFunction = functions.handler.auth.user.onCreate(() => null);
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-    });
-
-    describe('#onDelete', () => {
-      const cloudFunctionDelete: CloudFunction<UserRecord> = functions.handler.auth.user.onDelete(
-        (data: UserRecord) => data
-      );
-
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.auth.user.onDelete(() => null);
-        expect(cloudFunction.__trigger).to.deep.equal({});
-      });
-
-      it('should return an empty endpoint', () => {
-        const cloudFunction = functions.handler.auth.user.onDelete(() => null);
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should handle wire format as of v5.0.0 of firebase-admin', () => {
-        return cloudFunctionDelete(event.data, event.context).then(
-          (data: any) => {
-            expect(data.metadata.creationTime).to.equal(
-              '2016-12-15T19:37:37.059Z'
-            );
-            expect(data.metadata.lastSignInTime).to.equal(
-              '2017-01-01T00:00:00.000Z'
-            );
-          }
-        );
+      it("should handle wire format as of v5.0.0 of firebase-admin", () => {
+        return cloudFunctionDelete(event.data, event.context).then((data: any) => {
+          expect(data.metadata.creationTime).to.equal("2016-12-15T19:37:37.059Z");
+          expect(data.metadata.lastSignInTime).to.equal("2017-01-01T00:00:00.000Z");
+        });
       });
     });
   });
 
-  describe('process.env.GCLOUD_PROJECT not set', () => {
-    it('should not throw if __trigger is not accessed', () => {
+  describe("process.env.GCLOUD_PROJECT not set", () => {
+    it("should not throw if __endpoint is not accessed", () => {
       expect(() => auth.user().onCreate(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when trigger is accessed', () => {
-      expect(() => auth.user().onCreate(() => null).__trigger).to.throw(Error);
-    });
-
-    it('should throw when endpoint is accessed', () => {
+    it("should throw when endpoint is accessed", () => {
       expect(() => auth.user().onCreate(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
+    it("should not throw when #run is called", () => {
       const cf = auth.user().onCreate(() => null);
       expect(cf.run).to.not.throw(Error);
     });
diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts
index 304c1d1fd..2d1368d59 100644
--- a/spec/v1/providers/database.spec.ts
+++ b/spec/v1/providers/database.spec.ts
@@ -20,30 +20,23 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { apps as appsNamespace } from '../../../src/apps';
-import * as config from '../../../src/config';
-import * as functions from '../../../src/index';
-import * as database from '../../../src/providers/database';
-import { applyChange } from '../../../src/utils';
-
-describe('Database Functions', () => {
-  describe('DatabaseBuilder', () => {
+import { expect } from "chai";
+import { getApp, setApp } from "../../../src/common/app";
+import * as config from "../../../src/common/config";
+import { applyChange } from "../../../src/common/utilities/utils";
+import * as functions from "../../../src/v1";
+import * as database from "../../../src/v1/providers/database";
+import { expectType } from "../../common/metaprogramming";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+
+describe("Database Functions", () => {
+  describe("DatabaseBuilder", () => {
     // TODO add tests for building a data or change based on the type of operation
 
-    function expectedTrigger(resource: string, eventType: string) {
-      return {
-        eventTrigger: {
-          resource,
-          eventType: `providers/google.firebase.database/eventTypes/${eventType}`,
-          service: 'firebaseio.com',
-        },
-      };
-    }
-
     function expectedEndpoint(resource: string, eventType: string) {
       return {
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         eventTrigger: {
           eventFilters: {
             resource,
@@ -56,756 +49,677 @@ describe('Database Functions', () => {
     }
 
     before(() => {
-      (config as any).firebaseConfigCache = {
-        databaseURL: 'https://subdomain.apse.firebasedatabase.app',
-      };
-      appsNamespace.init();
+      config.resetCache({
+        databaseURL: "https://subdomain.apse.firebasedatabase.app",
+      });
     });
 
     after(() => {
-      (config as any).firebaseConfigCache = null;
-      delete appsNamespace.singleton;
+      config.resetCache(undefined);
+      setApp(undefined);
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
-        .database.ref('/')
+        .database.ref("/")
         .onCreate((snap) => snap);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
+      expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
+      expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
 
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
 
-    describe('#onWrite()', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
-        const func = database.ref('foo').onWrite(() => null);
-
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.write'
-          )
-        );
+    describe("#onWrite()", () => {
+      it("should return a endpoint with appropriate values", () => {
+        const func = database.ref("foo").onWrite(() => null);
 
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.write'
-          )
+          expectedEndpoint("projects/_/instances/subdomain/refs/foo", "ref.write")
         );
       });
 
-      it('should let developers choose a database instance', () => {
+      it("should let developers choose a database instance", () => {
         const func = database
-          .instance('custom')
-          .ref('foo')
+          .instance("custom")
+          .ref("foo")
           .onWrite(() => null);
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.write')
-        );
-
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.write')
+          expectedEndpoint("projects/_/instances/custom/refs/foo", "ref.write")
         );
       });
 
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
+      it("should return a handler that emits events with a proper DataSnapshot", () => {
         const event = {
           data: {
             data: null,
-            delta: { foo: 'bar' },
+            delta: { foo: "bar" },
           },
           context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.write',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
+            eventId: "70172329041928",
+            eventType: "providers/google.firebase.database/eventTypes/ref.write",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            resource: "projects/_/instances/subdomains/refs/users",
           },
         };
-        const handler = database
-          .ref('/users/{id}')
-          .onWrite((change, context) => {
-            expect(change.after.val()).to.deep.equal({ foo: 'bar' });
-          });
+        const handler = database.ref("/users/{id}").onWrite((change) => {
+          expect(change.after.val()).to.deep.equal({ foo: "bar" });
+        });
 
         return handler(event.data, event.context);
       });
-    });
 
-    describe('#onCreate()', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
-        const func = database.ref('foo').onCreate(() => null);
+      it("Should have params of the correct type", () => {
+        database.ref("foo").onWrite((event, context) => {
+          expectType<Record<string, never>>(context.params);
+        });
+        database.ref("foo/{bar}").onWrite((event, context) => {
+          expectType<{ bar: string }>(context.params);
+        });
+        database.ref("foo/{bar}/{baz}").onWrite((event, context) => {
+          expectType<{ bar: string; baz: string }>(context.params);
+        });
+      });
+    });
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.create'
-          )
-        );
+    describe("#onCreate()", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
+        const func = database.ref("foo").onCreate(() => null);
 
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.create'
-          )
+          expectedEndpoint("projects/_/instances/subdomain/refs/foo", "ref.create")
         );
       });
 
-      it('should let developers choose a database instance', () => {
+      it("should let developers choose a database instance", () => {
         const func = database
-          .instance('custom')
-          .ref('foo')
+          .instance("custom")
+          .ref("foo")
           .onCreate(() => null);
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.create')
-        );
-
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.create')
+          expectedEndpoint("projects/_/instances/custom/refs/foo", "ref.create")
         );
       });
 
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
+      it("should return a handler that emits events with a proper DataSnapshot", () => {
         const event = {
           data: {
             data: null,
-            delta: { foo: 'bar' },
+            delta: { foo: "bar" },
           },
           context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.create',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
+            eventId: "70172329041928",
+            eventType: "providers/google.firebase.database/eventTypes/ref.create",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            resource: "projects/_/instances/subdomains/refs/users",
           },
         };
 
-        const handler = database
-          .ref('/users/{id}')
-          .onCreate((data, context) => {
-            expect(data.val()).to.deep.equal({ foo: 'bar' });
-          });
+        const handler = database.ref("/users/{id}").onCreate((data) => {
+          expect(data.val()).to.deep.equal({ foo: "bar" });
+        });
 
         return handler(event.data, event.context);
       });
-    });
 
-    describe('#onUpdate()', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
-        const func = database.ref('foo').onUpdate(() => null);
+      it("Should have params of the correct type", () => {
+        database.ref("foo").onCreate((event, context) => {
+          expectType<Record<string, never>>(context.params);
+        });
+        database.ref("foo/{bar}").onCreate((event, context) => {
+          expectType<{ bar: string }>(context.params);
+        });
+        database.ref("foo/{bar}/{baz}").onCreate((event, context) => {
+          expectType<{ bar: string; baz: string }>(context.params);
+        });
+      });
+    });
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.update'
-          )
-        );
+    describe("#onUpdate()", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
+        const func = database.ref("foo").onUpdate(() => null);
 
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.update'
-          )
+          expectedEndpoint("projects/_/instances/subdomain/refs/foo", "ref.update")
         );
       });
 
-      it('should let developers choose a database instance', () => {
+      it("should let developers choose a database instance", () => {
         const func = database
-          .instance('custom')
-          .ref('foo')
+          .instance("custom")
+          .ref("foo")
           .onUpdate(() => null);
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.update')
-        );
-
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.update')
+          expectedEndpoint("projects/_/instances/custom/refs/foo", "ref.update")
         );
       });
 
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
+      it("should return a handler that emits events with a proper DataSnapshot", () => {
         const event = {
           data: {
             data: null,
-            delta: { foo: 'bar' },
+            delta: { foo: "bar" },
           },
           context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.update',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
+            eventId: "70172329041928",
+            eventType: "providers/google.firebase.database/eventTypes/ref.update",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            resource: "projects/_/instances/subdomains/refs/users",
           },
         };
 
-        const handler = database
-          .ref('/users/{id}')
-          .onUpdate((change, context) => {
-            expect(change.after.val()).to.deep.equal({ foo: 'bar' });
-          });
+        const handler = database.ref("/users/{id}").onUpdate((change) => {
+          expect(change.after.val()).to.deep.equal({ foo: "bar" });
+        });
 
         return handler(event.data, event.context);
       });
-    });
 
-    describe('#onDelete()', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
-        const func = database.ref('foo').onDelete(() => null);
+      it("Should have params of the correct type", () => {
+        database.ref("foo").onUpdate((event, context) => {
+          expectType<Record<string, never>>(context.params);
+        });
+        database.ref("foo/{bar}").onUpdate((event, context) => {
+          expectType<{ bar: string }>(context.params);
+        });
+        database.ref("foo/{bar}/{baz}").onUpdate((event, context) => {
+          expectType<{ bar: string; baz: string }>(context.params);
+        });
+      });
+    });
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.delete'
-          )
-        );
+    describe("#onDelete()", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
+        const func = database.ref("foo").onDelete(() => null);
 
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint(
-            'projects/_/instances/subdomain/refs/foo',
-            'ref.delete'
-          )
+          expectedEndpoint("projects/_/instances/subdomain/refs/foo", "ref.delete")
         );
       });
 
-      it('should let developers choose a database instance', () => {
+      it("should let developers choose a database instance", () => {
         const func = database
-          .instance('custom')
-          .ref('foo')
+          .instance("custom")
+          .ref("foo")
           .onDelete(() => null);
 
-        expect(func.__trigger).to.deep.equal(
-          expectedTrigger('projects/_/instances/custom/refs/foo', 'ref.delete')
-        );
-
         expect(func.__endpoint).to.deep.equal(
-          expectedEndpoint('projects/_/instances/custom/refs/foo', 'ref.delete')
+          expectedEndpoint("projects/_/instances/custom/refs/foo", "ref.delete")
         );
       });
 
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
+      it("should return a handler that emits events with a proper DataSnapshot", () => {
         const event = {
           data: {
-            data: { foo: 'bar' },
+            data: { foo: "bar" },
             delta: null,
           },
           context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.delete',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
-          },
-        };
-
-        const handler = database
-          .ref('/users/{id}')
-          .onDelete((data, context) => {
-            expect(data.val()).to.deep.equal({ foo: 'bar' });
-          });
-
-        return handler(event.data, event.context);
-      });
-    });
-  });
-
-  describe('handler namespace', () => {
-    describe('#onWrite()', () => {
-      it('correctly sets trigger to {}', () => {
-        const cf = functions.handler.database.ref.onWrite(() => null);
-        expect(cf.__trigger).to.deep.equal({});
-        expect(cf.__endpoint).to.be.undefined;
-      });
-
-      it('should be able to use the instance entry point', () => {
-        const func = functions.handler.database.instance.ref.onWrite(
-          () => null
-        );
-        expect(func.__trigger).to.deep.equal({});
-        expect(func.__endpoint).to.be.undefined;
-      });
-
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
-        const event = {
-          data: {
-            data: null,
-            delta: { foo: 'bar' },
-          },
-          context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.write',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
-          },
-        };
-
-        const handler = functions.handler.database.ref.onWrite(
-          (change, context) => {
-            return expect(change.after.val()).to.deep.equal({ foo: 'bar' });
-          }
-        );
-
-        return handler(event.data, event.context);
-      });
-    });
-
-    describe('#onCreate()', () => {
-      it('correctly sets trigger to {}', () => {
-        const cf = functions.handler.database.ref.onCreate(() => null);
-        expect(cf.__trigger).to.deep.equal({});
-        expect(cf.__endpoint).to.be.undefined;
-      });
-
-      it('should be able to use the instance entry point', () => {
-        const func = functions.handler.database.instance.ref.onCreate(
-          () => null
-        );
-        expect(func.__trigger).to.deep.equal({});
-        expect(func.__endpoint).to.be.undefined;
-      });
-
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
-        const event = {
-          data: {
-            data: null,
-            delta: { foo: 'bar' },
-          },
-          context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.create',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
+            eventId: "70172329041928",
+            eventType: "providers/google.firebase.database/eventTypes/ref.delete",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            resource: "projects/_/instances/subdomains/refs/users",
           },
         };
-        const handler = functions.handler.database.ref.onCreate(
-          (data, context) => {
-            return expect(data.val()).to.deep.equal({ foo: 'bar' });
-          }
-        );
 
-        return handler(event.data, event.context);
-      });
-    });
-
-    describe('#onUpdate()', () => {
-      it('correctly sets trigger to {}', () => {
-        const cf = functions.handler.database.ref.onUpdate(() => null);
-        expect(cf.__trigger).to.deep.equal({});
-        expect(cf.__endpoint).to.be.undefined;
-      });
-
-      it('should be able to use the instance entry point', () => {
-        const func = functions.handler.database.instance.ref.onUpdate(
-          () => null
-        );
-        expect(func.__trigger).to.deep.equal({});
-        expect(func.__endpoint).to.be.undefined;
-      });
-
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
-        const event = {
-          data: {
-            data: null,
-            delta: { foo: 'bar' },
-          },
-          context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.update',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
-          },
-        };
-        const handler = functions.handler.database.ref.onUpdate(
-          (change, context) => {
-            return expect(change.after.val()).to.deep.equal({ foo: 'bar' });
-          }
-        );
+        const handler = database.ref("/users/{id}").onDelete((data) => {
+          expect(data.val()).to.deep.equal({ foo: "bar" });
+        });
 
         return handler(event.data, event.context);
       });
     });
 
-    describe('#onDelete()', () => {
-      it('correctly sets trigger to {}', () => {
-        const cf = functions.handler.database.ref.onDelete(() => null);
-        expect(cf.__trigger).to.deep.equal({});
-        expect(cf.__endpoint).to.be.undefined;
+    it("Should have params of the correct type", () => {
+      database.ref("foo").onDelete((event, context) => {
+        expectType<Record<string, never>>(context.params);
       });
-
-      it('should be able to use the instance entry point', () => {
-        const func = functions.handler.database.instance.ref.onDelete(
-          () => null
-        );
-        expect(func.__trigger).to.deep.equal({});
-        expect(func.__endpoint).to.be.undefined;
+      database.ref("foo/{bar}").onDelete((event, context) => {
+        expectType<{ bar: string }>(context.params);
       });
-
-      it('should return a handler that emits events with a proper DataSnapshot', () => {
-        const event = {
-          data: {
-            data: { foo: 'bar' },
-            delta: null,
-          },
-          context: {
-            eventId: '70172329041928',
-            eventType:
-              'providers/google.firebase.database/eventTypes/ref.delete',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            resource: 'projects/_/instances/subdomains/refs/users',
-          },
-        };
-
-        const handler = functions.handler.database.ref.onDelete(
-          (data, context) => {
-            return expect(data.val()).to.deep.equal({ foo: 'bar' });
-          }
-        );
-
-        return handler(event.data, event.context);
+      database.ref("foo/{bar}/{baz}").onDelete((event, context) => {
+        expectType<{ bar: string; baz: string }>(context.params);
       });
     });
   });
 
-  describe('process.env.FIREBASE_CONFIG not set', () => {
-    it('should not throw if __trigger is not accessed', () => {
-      expect(() => database.ref('/path').onWrite(() => null)).to.not.throw(
-        Error
-      );
-    });
-
-    it('should throw when trigger is accessed', () => {
-      expect(
-        () => database.ref('/path').onWrite(() => null).__trigger
-      ).to.throw(Error);
+  describe("process.env.FIREBASE_CONFIG not set", () => {
+    it("should not throw if __endpoint is not accessed", () => {
+      expect(() => database.ref("/path").onWrite(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when endpoint is accessed', () => {
-      expect(
-        () => database.ref('/path').onWrite(() => null).__endpoint
-      ).to.throw(Error);
+    it("should throw when endpoint is accessed", () => {
+      expect(() => database.ref("/path").onWrite(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
-      const cf = database.ref('/path').onWrite(() => null);
+    it("should not throw when #run is called", () => {
+      const cf = database.ref("/path").onWrite(() => null);
       expect(cf.run).to.not.throw(Error);
     });
   });
 
-  describe('extractInstanceAndPath', () => {
-    it('should return correct us-central prod instance and path strings if domain is missing', () => {
+  describe("extractInstanceAndPath", () => {
+    it("should return correct us-central prod instance and path strings if domain is missing", () => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/bar',
+        "projects/_/instances/foo/refs/bar",
         undefined
       );
-      expect(instance).to.equal('https://foo.firebaseio.com');
-      expect(path).to.equal('/bar');
+      expect(instance).to.equal("https://foo.firebaseio.com");
+      expect(path).to.equal("/bar");
     });
 
-    it('should return the correct staging instance and path strings if domain is present', () => {
+    it("should return the correct staging instance and path strings if domain is present", () => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/bar',
-        'firebaseio-staging.com'
+        "projects/_/instances/foo/refs/bar",
+        "firebaseio-staging.com"
       );
-      expect(instance).to.equal('https://foo.firebaseio-staging.com');
-      expect(path).to.equal('/bar');
+      expect(instance).to.equal("https://foo.firebaseio-staging.com");
+      expect(path).to.equal("/bar");
     });
 
-    it('should return the correct instance and path strings if root path is /refs', () => {
+    it("should return the correct instance and path strings if root path is /refs", () => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/refs'
+        "projects/_/instances/foo/refs/refs"
       );
-      expect(instance).to.equal('https://foo.firebaseio.com');
-      expect(path).to.equal('/refs');
+      expect(instance).to.equal("https://foo.firebaseio.com");
+      expect(path).to.equal("/refs");
     });
 
-    it('should return the correct instance and path strings if a child path contain /refs', () => {
+    it("should return the correct instance and path strings if a child path contain /refs", () => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/root/refs'
+        "projects/_/instances/foo/refs/root/refs"
       );
-      expect(instance).to.equal('https://foo.firebaseio.com');
-      expect(path).to.equal('/root/refs');
+      expect(instance).to.equal("https://foo.firebaseio.com");
+      expect(path).to.equal("/root/refs");
     });
 
-    it('should return the correct multi-region instance and path strings if domain is present', () => {
+    it("should return the correct multi-region instance and path strings if domain is present", () => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/bar',
-        'euw1.firebasedatabase.app'
+        "projects/_/instances/foo/refs/bar",
+        "euw1.firebasedatabase.app"
       );
-      expect(instance).to.equal('https://foo.euw1.firebasedatabase.app');
-      expect(path).to.equal('/bar');
+      expect(instance).to.equal("https://foo.euw1.firebasedatabase.app");
+      expect(path).to.equal("/bar");
     });
 
-    it('should throw an error if the given instance name contains anything except alphanumerics and dashes', () => {
+    it("should throw an error if the given instance name contains anything except alphanumerics and dashes", () => {
       expect(() => {
         return database.extractInstanceAndPath(
-          'projects/_/instances/a.bad.name/refs/bar',
+          "projects/_/instances/a.bad.name/refs/bar",
           undefined
         );
       }).to.throw(Error);
       expect(() => {
         return database.extractInstanceAndPath(
-          'projects/_/instances/a_different_bad_name/refs/bar',
+          "projects/_/instances/a_different_bad_name/refs/bar",
           undefined
         );
       }).to.throw(Error);
       expect(() => {
-        return database.extractInstanceAndPath(
-          'projects/_/instances/BAD!!!!/refs/bar',
-          undefined
-        );
+        return database.extractInstanceAndPath("projects/_/instances/BAD!!!!/refs/bar", undefined);
       }).to.throw(Error);
     });
 
-    it('should use the emulator host when present', () => {
-      process.env.FIREBASE_DATABASE_EMULATOR_HOST = 'localhost:1234';
+    it("should use the emulator host when present", () => {
+      process.env.FIREBASE_DATABASE_EMULATOR_HOST = "localhost:1234";
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/foo/refs/bar',
-        'firebaseio-staging.com'
+        "projects/_/instances/foo/refs/bar",
+        "firebaseio-staging.com"
       );
-      expect(instance).to.equal('http://localhost:1234/?ns=foo');
-      expect(path).to.equal('/bar');
+      expect(instance).to.equal("http://localhost:1234/?ns=foo");
+      expect(path).to.equal("/bar");
       delete process.env.FIREBASE_DATABASE_EMULATOR_HOST;
     });
   });
 
-  describe('DataSnapshot', () => {
+  describe("DataSnapshot", () => {
     let subject: any;
-    const apps = new appsNamespace.Apps();
 
     const populate = (data: any) => {
       const [instance, path] = database.extractInstanceAndPath(
-        'projects/_/instances/other-subdomain/refs/foo',
-        'firebaseio-staging.com'
+        "projects/_/instances/other-subdomain/refs/foo",
+        "firebaseio-staging.com"
       );
-      subject = new database.DataSnapshot(data, path, apps.admin, instance);
+      subject = new database.DataSnapshot(data, path, getApp(), instance);
     };
 
-    describe('#ref: firebase.database.Reference', () => {
-      it('should return a ref for correct instance, not the default instance', () => {
+    describe("#ref: firebase.database.Reference", () => {
+      it("should return a ref for correct instance, not the default instance", () => {
         populate({});
-        expect(subject.ref.toJSON()).to.equal(
-          'https://other-subdomain.firebaseio-staging.com/foo'
-        );
+        expect(subject.ref.toJSON()).to.equal("https://other-subdomain.firebaseio-staging.com/foo");
       });
     });
 
-    describe('#val(): any', () => {
-      it('should return child values based on the child path', () => {
-        populate(applyChange({ a: { b: 'c' } }, { a: { d: 'e' } }));
-        expect(subject.child('a').val()).to.deep.equal({ b: 'c', d: 'e' });
+    describe("#val(): any", () => {
+      it("should return child values based on the child path", () => {
+        populate(applyChange({ a: { b: "c" } }, { a: { d: "e" } }));
+        expect(subject.child("a").val()).to.deep.equal({ b: "c", d: "e" });
       });
 
-      it('should return null for children past a leaf', () => {
+      it("should return null for children past a leaf", () => {
         populate(applyChange({ a: 23 }, { b: 33 }));
-        expect(subject.child('a/b').val()).to.be.null;
-        expect(subject.child('b/c').val()).to.be.null;
+        expect(subject.child("a/b").val()).to.be.null;
+        expect(subject.child("b/c").val()).to.be.null;
       });
 
-      it('should return a leaf value', () => {
+      it("should return a leaf value", () => {
         populate(23);
         expect(subject.val()).to.eq(23);
         populate({ b: 23, a: null });
-        expect(subject.child('b').val()).to.eq(23);
+        expect(subject.child("b").val()).to.eq(23);
       });
 
-      it('should coerce object into array if all keys are integers', () => {
-        populate({ 0: 'a', 1: 'b', 2: { c: 'd' } });
-        expect(subject.val()).to.deep.equal(['a', 'b', { c: 'd' }]);
-        populate({ 0: 'a', 2: 'b', 3: { c: 'd' } });
-        expect(subject.val()).to.deep.equal(['a', , 'b', { c: 'd' }]);
-        populate({ foo: { 0: 'a', 1: 'b' } });
-        expect(subject.val()).to.deep.equal({ foo: ['a', 'b'] });
+      it("should coerce object into array if all keys are integers", () => {
+        populate({ 0: "a", 1: "b", 2: { c: "d" } });
+        expect(subject.val()).to.deep.equal(["a", "b", { c: "d" }]);
+        populate({ 0: "a", 2: "b", 3: { c: "d" } });
+        expect(subject.val()).to.deep.equal(["a", undefined, "b", { c: "d" }]);
+        populate({ foo: { 0: "a", 1: "b" } });
+        expect(subject.val()).to.deep.equal({ foo: ["a", "b"] });
       });
 
       // Regression test: zero-values (including children) were accidentally forwarded as 'null'.
-      it('should deal with zero-values appropriately', () => {
+      it("should deal with zero-values appropriately", () => {
         populate(0);
         expect(subject.val()).to.equal(0);
         populate({ myKey: 0 });
         expect(subject.val()).to.deep.equal({ myKey: 0 });
-
-        // Null values are still reported as null.
-        populate({ myKey: null });
-        expect(subject.val()).to.deep.equal({ myKey: null });
       });
 
       // Regression test: .val() was returning array of nulls when there's a property called length (BUG#37683995)
       it('should return correct values when data has "length" property', () => {
-        populate({ length: 3, foo: 'bar' });
-        expect(subject.val()).to.deep.equal({ length: 3, foo: 'bar' });
+        populate({ length: 3, foo: "bar" });
+        expect(subject.val()).to.deep.equal({ length: 3, foo: "bar" });
+      });
+
+      it("should deal with null-values appropriately", () => {
+        populate(null);
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: null });
+        expect(subject.val()).to.be.null;
+      });
+
+      it("should deal with empty object values appropriately", () => {
+        populate({});
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: {} });
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: { child: null } });
+        expect(subject.val()).to.be.null;
+      });
+
+      it("should deal with empty array values appropriately", () => {
+        populate([]);
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: [] });
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: [null] });
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: [{}] });
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: [{ myKey: null }] });
+        expect(subject.val()).to.be.null;
+
+        populate({ myKey: [{ myKey: {} }] });
+        expect(subject.val()).to.be.null;
       });
     });
 
-    describe('#child(): DataSnapshot', () => {
-      it('should work with multiple calls', () => {
-        populate({ a: { b: { c: 'd' } } });
-        expect(
-          subject
-            .child('a')
-            .child('b/c')
-            .val()
-        ).to.equal('d');
+    describe("#child(): DataSnapshot", () => {
+      it("should work with multiple calls", () => {
+        populate({ a: { b: { c: "d" } } });
+        expect(subject.child("a").child("b/c").val()).to.equal("d");
       });
     });
 
-    describe('#exists(): boolean', () => {
-      it('should be true for an object value', () => {
-        populate({ a: { b: 'c' } });
-        expect(subject.child('a').exists()).to.be.true;
+    describe("#exists(): boolean", () => {
+      it("should be true for an object value", () => {
+        populate({ a: { b: "c" } });
+        expect(subject.child("a").exists()).to.be.true;
+      });
+
+      it("should be true for a leaf value", () => {
+        populate({ a: { b: "c" } });
+        expect(subject.child("a/b").exists()).to.be.true;
       });
 
-      it('should be true for a leaf value', () => {
-        populate({ a: { b: 'c' } });
-        expect(subject.child('a/b').exists()).to.be.true;
+      it("should be false for a non-existent value", () => {
+        populate({ a: { b: "c", nullChild: null } });
+        expect(subject.child("d").exists()).to.be.false;
+        expect(subject.child("nullChild").exists()).to.be.false;
       });
 
-      it('should be false for a non-existent value', () => {
-        populate({ a: { b: 'c' } });
-        expect(subject.child('d').exists()).to.be.false;
+      it("should be false for a value pathed beyond a leaf", () => {
+        populate({ a: { b: "c" } });
+        expect(subject.child("a/b/c").exists()).to.be.false;
       });
 
-      it('should be false for a value pathed beyond a leaf', () => {
-        populate({ a: { b: 'c' } });
-        expect(subject.child('a/b/c').exists()).to.be.false;
+      it("should be false for an empty object value", () => {
+        populate({ a: {} });
+        expect(subject.child("a").exists()).to.be.false;
+
+        populate({ a: { child: null } });
+        expect(subject.child("a").exists()).to.be.false;
+
+        populate({ a: { child: {} } });
+        expect(subject.child("a").exists()).to.be.false;
+      });
+
+      it("should be false for an empty array value", () => {
+        populate({ a: [] });
+        expect(subject.child("a").exists()).to.be.false;
+
+        populate({ a: [null] });
+        expect(subject.child("a").exists()).to.be.false;
+
+        populate({ a: [{}] });
+        expect(subject.child("a").exists()).to.be.false;
       });
     });
 
-    describe('#forEach(action: (a: DataSnapshot) => boolean): boolean', () => {
-      it('should iterate through child snapshots', () => {
-        populate({ a: 'b', c: 'd' });
-        let out = '';
+    describe("#forEach(action: (a: DataSnapshot) => boolean): boolean", () => {
+      it("should iterate through child snapshots", () => {
+        populate({ a: "b", c: "d" });
+        let out = "";
         subject.forEach((snap: any) => {
           out += snap.val();
         });
-        expect(out).to.equal('bd');
+        expect(out).to.equal("bd");
       });
 
-      it('should have correct key values for child snapshots', () => {
-        populate({ a: 'b', c: 'd' });
-        let out = '';
+      it("should have correct key values for child snapshots", () => {
+        populate({ a: "b", c: "d" });
+        let out = "";
         subject.forEach((snap: any) => {
           out += snap.key;
         });
-        expect(out).to.equal('ac');
+        expect(out).to.equal("ac");
       });
 
-      it('should not execute for leaf or null nodes', () => {
+      it("should not execute for leaf or null nodes", () => {
         populate(23);
         let count = 0;
-        const counter = (snap: any) => count++;
+        const counter = () => count++;
 
         expect(subject.forEach(counter)).to.equal(false);
         expect(count).to.eq(0);
+
+        populate({
+          a: "foo",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
+        count = 0;
+
+        expect(subject.forEach(counter)).to.equal(false);
+        expect(count).to.eq(1);
       });
 
-      it('should cancel further enumeration if callback returns true', () => {
-        populate({ a: 'b', c: 'd', e: 'f', g: 'h' });
-        let out = '';
+      it("should cancel further enumeration if callback returns true", () => {
+        populate({ a: "b", c: "d", e: "f", g: "h" });
+        let out = "";
         const ret = subject.forEach((snap: any) => {
-          if (snap.val() === 'f') {
+          if (snap.val() === "f") {
             return true;
           }
           out += snap.val();
         });
-        expect(out).to.equal('bd');
+        expect(out).to.equal("bd");
         expect(ret).to.equal(true);
       });
 
-      it('should not cancel further enumeration if callback returns a truthy value', () => {
-        populate({ a: 'b', c: 'd', e: 'f', g: 'h' });
-        let out = '';
+      it("should not cancel further enumeration if callback returns a truthy value", () => {
+        populate({ a: "b", c: "d", e: "f", g: "h" });
+        let out = "";
         const ret = subject.forEach((snap: any) => {
           out += snap.val();
           return 1;
         });
-        expect(out).to.equal('bdfh');
+        expect(out).to.equal("bdfh");
         expect(ret).to.equal(false);
       });
 
-      it('should not cancel further enumeration if callback does not return', () => {
-        populate({ a: 'b', c: 'd', e: 'f', g: 'h' });
-        let out = '';
+      it("should not cancel further enumeration if callback does not return", () => {
+        populate({ a: "b", c: "d", e: "f", g: "h" });
+        let out = "";
         const ret = subject.forEach((snap: any) => {
           out += snap.val();
         });
-        expect(out).to.equal('bdfh');
+        expect(out).to.equal("bdfh");
         expect(ret).to.equal(false);
       });
     });
 
-    describe('#numChildren()', () => {
-      it('should be key count for objects', () => {
-        populate({ a: 'b', c: 'd' });
+    describe("#numChildren()", () => {
+      it("should be key count for objects", () => {
+        populate({
+          a: "b",
+          c: "d",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
         expect(subject.numChildren()).to.eq(2);
       });
 
-      it('should be 0 for non-objects', () => {
+      it("should be 0 for non-objects", () => {
         populate(23);
         expect(subject.numChildren()).to.eq(0);
+
+        populate({
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
+        expect(subject.numChildren()).to.eq(0);
       });
     });
 
-    describe('#hasChild(childPath): boolean', () => {
-      it('should return true for a child or deep child', () => {
-        populate({ a: { b: 'c' }, d: 23 });
-        expect(subject.hasChild('a/b')).to.be.true;
-        expect(subject.hasChild('d')).to.be.true;
+    describe("#hasChildren()", () => {
+      it("should true for objects", () => {
+        populate({
+          a: "b",
+          c: "d",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
+        expect(subject.hasChildren()).to.be.true;
       });
 
-      it('should return false if a child is missing', () => {
-        populate({ a: 'b' });
-        expect(subject.hasChild('c')).to.be.false;
-        expect(subject.hasChild('a/b')).to.be.false;
+      it("should be false for non-objects", () => {
+        populate(23);
+        expect(subject.hasChildren()).to.be.false;
+
+        populate({
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
+        expect(subject.hasChildren()).to.be.false;
       });
     });
 
-    describe('#key: string', () => {
-      it('should return the key name', () => {
-        expect(subject.key).to.equal('foo');
+    describe("#hasChild(childPath): boolean", () => {
+      it("should return true for a child or deep child", () => {
+        populate({ a: { b: "c" }, d: 23 });
+        expect(subject.hasChild("a/b")).to.be.true;
+        expect(subject.hasChild("d")).to.be.true;
       });
 
-      it('should return null for the root', () => {
+      it("should return false if a child is missing", () => {
+        populate({
+          a: "b",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
+        expect(subject.hasChild("c")).to.be.false;
+        expect(subject.hasChild("a/b")).to.be.false;
+        expect(subject.hasChild("nullChild")).to.be.false;
+        expect(subject.hasChild("emptyObjectChild")).to.be.false;
+        expect(subject.hasChild("emptyArrayChild")).to.be.false;
+        expect(subject.hasChild("c")).to.be.false;
+        expect(subject.hasChild("a/b")).to.be.false;
+      });
+    });
+
+    describe("#key: string", () => {
+      it("should return the key name", () => {
+        expect(subject.key).to.equal("foo");
+      });
+
+      it("should return null for the root", () => {
         const [instance, path] = database.extractInstanceAndPath(
-          'projects/_/instances/foo/refs/',
+          "projects/_/instances/foo/refs/",
           undefined
         );
-        const snapshot = new database.DataSnapshot(
-          null,
-          path,
-          apps.admin,
-          instance
-        );
+        const snapshot = new database.DataSnapshot(null, path, getApp(), instance);
         expect(snapshot.key).to.be.null;
       });
 
-      it('should work for child paths', () => {
-        expect(subject.child('foo/bar').key).to.equal('bar');
+      it("should work for child paths", () => {
+        expect(subject.child("foo/bar").key).to.equal("bar");
       });
     });
 
-    describe('#toJSON(): Object', () => {
-      it('should return the current value', () => {
-        populate({ a: 'b' });
+    describe("#toJSON(): Object", () => {
+      it("should return the current value", () => {
+        populate({
+          a: "b",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
         expect(subject.toJSON()).to.deep.equal(subject.val());
       });
-      it('should be stringifyable', () => {
-        populate({ a: 'b' });
+
+      it("should be stringifyable", () => {
+        populate({
+          a: "b",
+          nullChild: null,
+          emptyObjectChild: {},
+          emptyArrayChild: [],
+        });
         expect(JSON.stringify(subject)).to.deep.equal('{"a":"b"}');
       });
     });
diff --git a/spec/v1/providers/firestore.spec.ts b/spec/v1/providers/firestore.spec.ts
index 3f9f07fbe..1c66ec31b 100644
--- a/spec/v1/providers/firestore.spec.ts
+++ b/spec/v1/providers/firestore.spec.ts
@@ -20,20 +20,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as admin from 'firebase-admin';
-import * as _ from 'lodash';
+import { expect } from "chai";
+import { Timestamp } from "firebase-admin/firestore";
 
-import * as functions from '../../../src/index';
-import * as firestore from '../../../src/providers/firestore';
+import * as functions from "../../../src/v1";
+import * as firestore from "../../../src/v1/providers/firestore";
+import { expectType } from "../../common/metaprogramming";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
 
-describe('Firestore Functions', () => {
+describe("Firestore Functions", () => {
   function constructValue(fields: any) {
     return {
       fields,
-      name: 'projects/pid/databases/(default)/documents/collection/123',
-      createTime: '2017-06-02T18:48:58.920638Z',
-      updateTime: '2017-07-02T18:48:58.920638Z',
+      name: "projects/pid/databases/(default)/documents/collection/123",
+      createTime: "2017-06-02T18:48:58.920638Z",
+      updateTime: "2017-07-02T18:48:58.920638Z",
     };
   }
 
@@ -41,22 +42,20 @@ describe('Firestore Functions', () => {
     context = context || {};
     return {
       data,
-      context: _.merge(
-        {
-          eventId: '123',
-          timestamp: '2018-07-03T00:49:04.264Z',
-          eventType: 'google.firestore.document.create',
-          resource: {
-            name: 'projects/myproj/databases/(default)/documents/tests/test1',
-            service: 'service',
-          },
+      context: {
+        eventId: "123",
+        timestamp: "2018-07-03T00:49:04.264Z",
+        eventType: "google.firestore.document.create",
+        resource: {
+          name: "projects/myproj/databases/(default)/documents/tests/test1",
+          service: "service",
         },
-        context
-      ),
+        ...context,
+      },
     };
   }
 
-  function constructEvent(oldValue: object, value: object, eventType: string) {
+  function constructEvent(oldValue: object, value: object) {
     return {
       data: {
         oldValue,
@@ -64,7 +63,7 @@ describe('Firestore Functions', () => {
       },
       context: {
         resource: {
-          name: 'resource',
+          name: "resource",
         },
       },
     };
@@ -76,7 +75,7 @@ describe('Firestore Functions', () => {
         booleanValue: false,
       },
       key2: {
-        integerValue: '111',
+        integerValue: "111",
       },
     });
   }
@@ -87,25 +86,16 @@ describe('Firestore Functions', () => {
         booleanValue: true,
       },
       key2: {
-        integerValue: '123',
+        integerValue: "123",
       },
     });
   }
 
-  describe('document builders and event types', () => {
-    function expectedTrigger(resource: string, eventType: string) {
-      return {
-        eventTrigger: {
-          resource,
-          eventType: `providers/cloud.firestore/eventTypes/${eventType}`,
-          service: 'firestore.googleapis.com',
-        },
-      };
-    }
-
+  describe("document builders and event types", () => {
     function expectedEndpoint(resource: string, eventType: string) {
       return {
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         eventTrigger: {
           eventFilters: {
             resource,
@@ -118,128 +108,93 @@ describe('Firestore Functions', () => {
     }
 
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
     });
 
     after(() => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should allow terse constructors', () => {
-      const resource =
-        'projects/project1/databases/(default)/documents/users/{uid}';
-      const cloudFunction = firestore
-        .document('users/{uid}')
-        .onWrite(() => null);
-
-      expect(cloudFunction.__trigger).to.deep.equal(
-        expectedTrigger(resource, 'document.write')
-      );
+    it("should allow terse constructors", () => {
+      const resource = "projects/project1/databases/(default)/documents/users/{uid}";
+      const cloudFunction = firestore.document("users/{uid}").onWrite((snap, context) => {
+        expectType<{ uid: string }>(context.params);
+      });
 
-      expect(cloudFunction.__endpoint).to.deep.equal(
-        expectedEndpoint(resource, 'document.write')
-      );
+      expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(resource, "document.write"));
     });
 
-    it('should allow custom namespaces', () => {
-      const resource =
-        'projects/project1/databases/(default)/documents@v2/users/{uid}';
+    it("should allow custom namespaces", () => {
+      const resource = "projects/project1/databases/(default)/documents@v2/users/{uid}";
       const cloudFunction = firestore
-        .namespace('v2')
-        .document('users/{uid}')
-        .onWrite(() => null);
-
-      expect(cloudFunction.__trigger).to.deep.equal(
-        expectedTrigger(resource, 'document.write')
-      );
+        .namespace("v2")
+        .document("users/{uid}")
+        .onWrite((snap, context) => {
+          expectType<{ uid: string }>(context.params);
+        });
 
-      expect(cloudFunction.__endpoint).to.deep.equal(
-        expectedEndpoint(resource, 'document.write')
-      );
+      expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(resource, "document.write"));
     });
 
-    it('should allow custom databases', () => {
-      const resource = 'projects/project1/databases/myDB/documents/users/{uid}';
+    it("should allow custom databases", () => {
+      const resource = "projects/project1/databases/myDB/documents/users/{uid}";
       const cloudFunction = firestore
-        .database('myDB')
-        .document('users/{uid}')
+        .database("myDB")
+        .document("users/{uid}")
         .onWrite(() => null);
 
-      expect(cloudFunction.__trigger).to.deep.equal(
-        expectedTrigger(resource, 'document.write')
-      );
-
-      expect(cloudFunction.__endpoint).to.deep.equal(
-        expectedEndpoint(resource, 'document.write')
-      );
+      expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(resource, "document.write"));
     });
 
-    it('should allow both custom database and namespace', () => {
-      const resource =
-        'projects/project1/databases/myDB/documents@v2/users/{uid}';
+    it("should allow both custom database and namespace", () => {
+      const resource = "projects/project1/databases/myDB/documents@v2/users/{uid}";
       const cloudFunction = firestore
-        .database('myDB')
-        .namespace('v2')
-        .document('users/{uid}')
-        .onWrite(() => null);
-
-      expect(cloudFunction.__trigger).to.deep.equal(
-        expectedTrigger(resource, 'document.write')
-      );
+        .database("myDB")
+        .namespace("v2")
+        .document("users/{uid}")
+        .onWrite((snap, context) => {
+          expectType<{ uid: string }>(context.params);
+        });
 
-      expect(cloudFunction.__endpoint).to.deep.equal(
-        expectedEndpoint(resource, 'document.write')
-      );
+      expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(resource, "document.write"));
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
-        .firestore.document('doc')
-        .onCreate((snap) => snap);
-
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
+        .firestore.document("doc")
+        .onCreate((snap, context) => {
+          expectType<Record<string, string>>(context.params);
+        });
 
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
   });
 
-  describe('process.env.GCLOUD_PROJECT not set', () => {
-    it('should not throw if __trigger is not accessed', () => {
-      expect(() =>
-        firestore.document('input').onCreate(() => null)
-      ).to.not.throw(Error);
-    });
-
-    it('should throw when trigger is accessed', () => {
-      expect(
-        () => firestore.document('input').onCreate(() => null).__trigger
-      ).to.throw(Error);
+  describe("process.env.GCLOUD_PROJECT not set", () => {
+    it("should not throw if __endpoint is not accessed", () => {
+      expect(() => firestore.document("input").onCreate(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when endpoint is accessed', () => {
-      expect(
-        () => firestore.document('input').onCreate(() => null).__endpoint
-      ).to.throw(Error);
+    it("should throw when endpoint is accessed", () => {
+      expect(() => firestore.document("input").onCreate(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
-      const cf = firestore.document('input').onCreate(() => null);
+    it("should not throw when #run is called", () => {
+      const cf = firestore.document("input").onCreate(() => null);
       expect(cf.run).to.not.throw(Error);
     });
   });
 
-  describe('dataConstructor', () => {
+  describe("dataConstructor", () => {
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
     });
 
     after(() => {
@@ -247,164 +202,68 @@ describe('Firestore Functions', () => {
     });
 
     it('constructs appropriate fields and getters for event.data on "document.write" events', () => {
-      const testFunction = firestore
-        .document('path')
-        .onWrite((change, context) => {
-          expect(change.before.data()).to.deep.equal({
-            key1: false,
-            key2: 111,
-          });
-          expect(change.before.get('key1')).to.equal(false);
-          expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(change.after.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
+      const testFunction = firestore.document("path").onWrite((change) => {
+        expect(change.before.data()).to.deep.equal({
+          key1: false,
+          key2: 111,
         });
-      const event = constructEvent(
-        createOldValue(),
-        createValue(),
-        'document.write'
-      );
+        expect(change.before.get("key1")).to.equal(false);
+        expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
+        expect(change.after.get("key1")).to.equal(true);
+        return true; // otherwise will get warning about returning undefined
+      });
+      const event = constructEvent(createOldValue(), createValue());
       return testFunction(event.data, event.context);
     }).timeout(5000);
 
     it('constructs appropriate fields and getters for event.data on "document.create" events', () => {
-      const testFunction = firestore
-        .document('path')
-        .onCreate((data, context) => {
-          expect(data.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(data.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
-        });
-      const event = constructEvent({}, createValue(), 'document.create');
+      const testFunction = firestore.document("path").onCreate((data) => {
+        expect(data.data()).to.deep.equal({ key1: true, key2: 123 });
+        expect(data.get("key1")).to.equal(true);
+        return true; // otherwise will get warning about returning undefined
+      });
+      const event = constructEvent({}, createValue());
       return testFunction(event.data, event.context);
     }).timeout(5000);
 
     it('constructs appropriate fields and getters for event.data on "document.update" events', () => {
-      const testFunction = firestore
-        .document('path')
-        .onUpdate((change, context) => {
-          expect(change.before.data()).to.deep.equal({
-            key1: false,
-            key2: 111,
-          });
-          expect(change.before.get('key1')).to.equal(false);
-          expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(change.after.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
+      const testFunction = firestore.document("path").onUpdate((change) => {
+        expect(change.before.data()).to.deep.equal({
+          key1: false,
+          key2: 111,
         });
-      const event = constructEvent(
-        createOldValue(),
-        createValue(),
-        'document.update'
-      );
+        expect(change.before.get("key1")).to.equal(false);
+        expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
+        expect(change.after.get("key1")).to.equal(true);
+        return true; // otherwise will get warning about returning undefined
+      });
+      const event = constructEvent(createOldValue(), createValue());
       return testFunction(event.data, event.context);
     }).timeout(5000);
 
     it('constructs appropriate fields and getters for event.data on "document.delete" events', () => {
-      const testFunction = firestore
-        .document('path')
-        .onDelete((data, context) => {
-          expect(data.data()).to.deep.equal({ key1: false, key2: 111 });
-          expect(data.get('key1')).to.equal(false);
-          return true; // otherwise will get warning about returning undefined
-        });
-      const event = constructEvent(createOldValue(), {}, 'document.delete');
-      return testFunction(event.data, event.context);
-    }).timeout(5000);
-  });
-
-  describe('handler namespace', () => {
-    before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
-    });
-
-    after(() => {
-      delete process.env.GCLOUD_PROJECT;
-    });
-
-    it('constructs correct data type and sets trigger to {} on "document.write" events', () => {
-      const testFunction = functions.handler.firestore.document.onWrite(
-        (change, context) => {
-          expect(change.before.data()).to.deep.equal({
-            key1: false,
-            key2: 111,
-          });
-          expect(change.before.get('key1')).to.equal(false);
-          expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(change.after.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
-        }
-      );
-      expect(testFunction.__trigger).to.deep.equal({});
-      const event = constructEvent(
-        createOldValue(),
-        createValue(),
-        'document.write'
-      );
-      return testFunction(event.data, event.context);
-    }).timeout(5000);
-
-    it('constructs correct data type and sets trigger to {} on "document.create" events', () => {
-      const testFunction = functions.handler.firestore.document.onCreate(
-        (data, context) => {
-          expect(data.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(data.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
-        }
-      );
-      expect(testFunction.__trigger).to.deep.equal({});
-      const event = constructEvent({}, createValue(), 'document.create');
-      return testFunction(event.data, event.context);
-    }).timeout(5000);
-
-    it('constructs correct data type and sets trigger to {} on "document.update" events', () => {
-      const testFunction = functions.handler.firestore.document.onUpdate(
-        (change) => {
-          expect(change.before.data()).to.deep.equal({
-            key1: false,
-            key2: 111,
-          });
-          expect(change.before.get('key1')).to.equal(false);
-          expect(change.after.data()).to.deep.equal({ key1: true, key2: 123 });
-          expect(change.after.get('key1')).to.equal(true);
-          return true; // otherwise will get warning about returning undefined
-        }
-      );
-      expect(testFunction.__trigger).to.deep.equal({});
-      const event = constructEvent(
-        createOldValue(),
-        createValue(),
-        'document.update'
-      );
-      return testFunction(event.data, event.context);
-    }).timeout(5000);
-
-    it('constructs correct data type and sets trigger to {} on "document.delete" events', () => {
-      const testFunction = functions.handler.firestore.document.onDelete(
-        (data, context) => {
-          expect(data.data()).to.deep.equal({ key1: false, key2: 111 });
-          expect(data.get('key1')).to.equal(false);
-          return true; // otherwise will get warning about returning undefined
-        }
-      );
-      const event = constructEvent(createOldValue(), {}, 'document.delete');
-      expect(testFunction.__trigger).to.deep.equal({});
+      const testFunction = firestore.document("path").onDelete((data) => {
+        expect(data.data()).to.deep.equal({ key1: false, key2: 111 });
+        expect(data.get("key1")).to.equal(false);
+        return true; // otherwise will get warning about returning undefined
+      });
+      const event = constructEvent(createOldValue(), {});
       return testFunction(event.data, event.context);
     }).timeout(5000);
   });
 
-  describe('SnapshotConstructor', () => {
-    describe('#data()', () => {
-      it('should parse int values', () => {
+  describe("SnapshotConstructor", () => {
+    describe("#data()", () => {
+      it("should parse int values", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
-            value: constructValue({ key: { integerValue: '123' } }),
+            value: constructValue({ key: { integerValue: "123" } }),
           })
         );
         expect(snapshot.data()).to.deep.equal({ key: 123 });
       });
 
-      it('should parse double values', () => {
+      it("should parse double values", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
             value: constructValue({ key: { doubleValue: 12.34 } }),
@@ -413,7 +272,7 @@ describe('Firestore Functions', () => {
         expect(snapshot.data()).to.deep.equal({ key: 12.34 });
       });
 
-      it('should parse null values', () => {
+      it("should parse null values", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
             value: constructValue({ key: { nullValue: null } }),
@@ -422,7 +281,7 @@ describe('Firestore Functions', () => {
         expect(snapshot.data()).to.deep.equal({ key: null });
       });
 
-      it('should parse boolean values', () => {
+      it("should parse boolean values", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
             value: constructValue({ key: { booleanValue: true } }),
@@ -431,20 +290,20 @@ describe('Firestore Functions', () => {
         expect(snapshot.data()).to.deep.equal({ key: true });
       });
 
-      it('should parse string values', () => {
+      it("should parse string values", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
-            value: constructValue({ key: { stringValue: 'foo' } }),
+            value: constructValue({ key: { stringValue: "foo" } }),
           })
         );
-        expect(snapshot.data()).to.deep.equal({ key: 'foo' });
+        expect(snapshot.data()).to.deep.equal({ key: "foo" });
       });
 
-      it('should parse array values', () => {
+      it("should parse array values", () => {
         const raw = constructValue({
           key: {
             arrayValue: {
-              values: [{ integerValue: '1' }, { integerValue: '2' }],
+              values: [{ integerValue: "1" }, { integerValue: "2" }],
             },
           },
         });
@@ -456,16 +315,16 @@ describe('Firestore Functions', () => {
         expect(snapshot.data()).to.deep.equal({ key: [1, 2] });
       });
 
-      it('should parse object values', () => {
+      it("should parse object values", () => {
         const raw = constructValue({
           keyParent: {
             mapValue: {
               fields: {
                 key1: {
-                  stringValue: 'val1',
+                  stringValue: "val1",
                 },
                 key2: {
-                  stringValue: 'val2',
+                  stringValue: "val2",
                 },
               },
             },
@@ -477,11 +336,11 @@ describe('Firestore Functions', () => {
           })
         );
         expect(snapshot.data()).to.deep.equal({
-          keyParent: { key1: 'val1', key2: 'val2' },
+          keyParent: { key1: "val1", key2: "val2" },
         });
       });
 
-      it('should parse GeoPoint values', () => {
+      it("should parse GeoPoint values", () => {
         const raw = constructValue({
           geoPointValue: {
             mapValue: {
@@ -509,11 +368,10 @@ describe('Firestore Functions', () => {
         });
       });
 
-      it('should parse reference values', () => {
+      it("should parse reference values", () => {
         const raw = constructValue({
           referenceVal: {
-            referenceValue:
-              'projects/proj1/databases/(default)/documents/doc1/id',
+            referenceValue: "projects/proj1/databases/(default)/documents/doc1/id",
           },
         });
         const snapshot = firestore.snapshotConstructor(
@@ -521,13 +379,13 @@ describe('Firestore Functions', () => {
             value: raw,
           })
         );
-        expect(_.get(snapshot.data(), 'referenceVal').path).to.equal('doc1/id');
+        expect(snapshot.data()?.referenceVal?.path).to.equal("doc1/id");
       });
 
-      it('should parse timestamp values with precision to the millisecond', () => {
+      it("should parse timestamp values with precision to the millisecond", () => {
         const raw = constructValue({
           timestampVal: {
-            timestampValue: '2017-06-13T00:58:40.349Z',
+            timestampValue: "2017-06-13T00:58:40.349Z",
           },
         });
         const snapshot = firestore.snapshotConstructor(
@@ -536,16 +394,14 @@ describe('Firestore Functions', () => {
           })
         );
         expect(snapshot.data()).to.deep.equal({
-          timestampVal: admin.firestore.Timestamp.fromDate(
-            new Date('2017-06-13T00:58:40.349Z')
-          ),
+          timestampVal: Timestamp.fromDate(new Date("2017-06-13T00:58:40.349Z")),
         });
       });
 
-      it('should parse timestamp values with precision to the second', () => {
+      it("should parse timestamp values with precision to the second", () => {
         const raw = constructValue({
           timestampVal: {
-            timestampValue: '2017-06-13T00:58:40Z',
+            timestampValue: "2017-06-13T00:58:40Z",
           },
         });
         const snapshot = firestore.snapshotConstructor(
@@ -554,17 +410,15 @@ describe('Firestore Functions', () => {
           })
         );
         expect(snapshot.data()).to.deep.equal({
-          timestampVal: admin.firestore.Timestamp.fromDate(
-            new Date('2017-06-13T00:58:40Z')
-          ),
+          timestampVal: Timestamp.fromDate(new Date("2017-06-13T00:58:40Z")),
         });
       });
 
-      it('should parse binary values', () => {
+      it("should parse binary values", () => {
         // Format defined in https://developers.google.com/discovery/v1/type-format
         const raw = constructValue({
           binaryVal: {
-            bytesValue: 'Zm9vYmFy',
+            bytesValue: "Zm9vYmFy",
           },
         });
         const snapshot = firestore.snapshotConstructor(
@@ -573,12 +427,12 @@ describe('Firestore Functions', () => {
           })
         );
         expect(snapshot.data()).to.deep.equal({
-          binaryVal: Buffer.from('foobar'),
+          binaryVal: Buffer.from("foobar"),
         });
       });
     });
 
-    describe('Other DocumentSnapshot methods', () => {
+    describe("Other DocumentSnapshot methods", () => {
       let snapshot: FirebaseFirestore.DocumentSnapshot;
       let newSnapshot: FirebaseFirestore.DocumentSnapshot;
 
@@ -586,58 +440,58 @@ describe('Firestore Functions', () => {
         snapshot = firestore.snapshotConstructor(
           makeEvent({
             value: {
-              fields: { key: { integerValue: '1' } },
-              createTime: '2017-06-17T14:45:17.876479Z',
-              updateTime: '2017-08-31T18:05:26.928527Z',
-              readTime: '2017-07-31T18:23:26.928527Z',
-              name: 'projects/pid/databases/(default)/documents/collection/123',
+              fields: { key: { integerValue: "1" } },
+              createTime: "2017-06-17T14:45:17.876479Z",
+              updateTime: "2017-08-31T18:05:26.928527Z",
+              readTime: "2017-07-31T18:23:26.928527Z",
+              name: "projects/pid/databases/(default)/documents/collection/123",
             },
           })
         );
         newSnapshot = firestore.snapshotConstructor(
           makeEvent({
             value: {
-              fields: { key: { integerValue: '2' } },
-              createTime: '2017-06-17T14:45:17.876479Z',
-              updateTime: '2017-06-17T14:45:17.876479Z',
-              name: 'projects/pid/databases/(default)/documents/collection/124',
+              fields: { key: { integerValue: "2" } },
+              createTime: "2017-06-17T14:45:17.876479Z",
+              updateTime: "2017-06-17T14:45:17.876479Z",
+              name: "projects/pid/databases/(default)/documents/collection/124",
             },
           })
         );
       });
 
-      it('should support #exists', () => {
+      it("should support #exists", () => {
         expect(snapshot.exists).to.be.true;
       });
 
-      it('should support #ref', () => {
-        expect(snapshot.ref.path).to.equal('collection/123');
+      it("should support #ref", () => {
+        expect(snapshot.ref.path).to.equal("collection/123");
       });
 
-      it('should support #id', () => {
-        expect(snapshot.id).to.equal('123');
+      it("should support #id", () => {
+        expect(snapshot.id).to.equal("123");
       });
 
-      it('should support #createTime', () => {
-        expect(snapshot.createTime.seconds).to.be.a('number');
-        expect(snapshot.createTime.nanoseconds).to.be.a('number');
+      it("should support #createTime", () => {
+        expect(snapshot.createTime.seconds).to.be.a("number");
+        expect(snapshot.createTime.nanoseconds).to.be.a("number");
       });
 
-      it('should support #updateTime', () => {
-        expect(snapshot.updateTime.seconds).to.be.a('number');
-        expect(snapshot.updateTime.nanoseconds).to.be.a('number');
+      it("should support #updateTime", () => {
+        expect(snapshot.updateTime.seconds).to.be.a("number");
+        expect(snapshot.updateTime.nanoseconds).to.be.a("number");
       });
 
-      it('should support #readTime', () => {
-        expect(snapshot.readTime.seconds).to.be.a('number');
-        expect(snapshot.readTime.nanoseconds).to.be.a('number');
-        expect(newSnapshot.readTime.seconds).to.be.a('number');
-        expect(newSnapshot.readTime.nanoseconds).to.be.a('number');
+      it("should support #readTime", () => {
+        expect(snapshot.readTime.seconds).to.be.a("number");
+        expect(snapshot.readTime.nanoseconds).to.be.a("number");
+        expect(newSnapshot.readTime.seconds).to.be.a("number");
+        expect(newSnapshot.readTime.nanoseconds).to.be.a("number");
       });
     });
 
-    describe('Handle empty and non-existent documents', () => {
-      it('constructs non-existent DocumentSnapshot when whole document deleted', () => {
+    describe("Handle empty and non-existent documents", () => {
+      it("constructs non-existent DocumentSnapshot when whole document deleted", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent(
             {
@@ -645,31 +499,30 @@ describe('Firestore Functions', () => {
             },
             {
               resource: {
-                name:
-                  'projects/pid/databases/(default)/documents/collection/123',
+                name: "projects/pid/databases/(default)/documents/collection/123",
               },
             }
           )
         );
         expect(snapshot.exists).to.be.false;
-        expect(snapshot.ref.path).to.equal('collection/123');
+        expect(snapshot.ref.path).to.equal("collection/123");
       });
 
-      it('constructs existent DocumentSnapshot with empty data when all fields of document deleted', () => {
+      it("constructs existent DocumentSnapshot with empty data when all fields of document deleted", () => {
         const snapshot = firestore.snapshotConstructor(
           makeEvent({
             value: {
               // value is not empty when document still exists
-              createTime: '2017-06-02T18:48:58.920638Z',
-              updateTime: '2017-07-02T18:48:58.920638Z',
-              name: 'projects/pid/databases/(default)/documents/collection/123',
+              createTime: "2017-06-02T18:48:58.920638Z",
+              updateTime: "2017-07-02T18:48:58.920638Z",
+              name: "projects/pid/databases/(default)/documents/collection/123",
             },
           })
         );
         expect(snapshot.exists).to.be.true;
-        expect(snapshot.ref.path).to.equal('collection/123');
+        expect(snapshot.ref.path).to.equal("collection/123");
         expect(snapshot.data()).to.deep.equal({});
-        expect(snapshot.get('key1')).to.equal(undefined);
+        expect(snapshot.get("key1")).to.equal(undefined);
       });
     });
   });
diff --git a/spec/v1/providers/fixtures.ts b/spec/v1/providers/fixtures.ts
new file mode 100644
index 000000000..e047ba07f
--- /dev/null
+++ b/spec/v1/providers/fixtures.ts
@@ -0,0 +1,50 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+import { ManifestEndpoint } from "../../../src/runtime/manifest";
+import * as functions from "../../../src/v1";
+import * as options from "../../../src/v2/options";
+
+export const MINIMIAL_TASK_QUEUE_TRIGGER: ManifestEndpoint["taskQueueTrigger"] = {
+  rateLimits: {
+    maxConcurrentDispatches: functions.RESET_VALUE,
+    maxDispatchesPerSecond: functions.RESET_VALUE,
+  },
+  retryConfig: {
+    maxAttempts: functions.RESET_VALUE,
+    maxBackoffSeconds: functions.RESET_VALUE,
+    maxDoublings: functions.RESET_VALUE,
+    maxRetrySeconds: functions.RESET_VALUE,
+    minBackoffSeconds: functions.RESET_VALUE,
+  },
+};
+
+export const MINIMAL_SCHEDULE_TRIGGER: ManifestEndpoint["scheduleTrigger"] = {
+  schedule: "",
+  timeZone: options.RESET_VALUE,
+  retryConfig: {
+    retryCount: options.RESET_VALUE,
+    maxRetryDuration: options.RESET_VALUE,
+    maxBackoffDuration: options.RESET_VALUE,
+    minBackoffDuration: options.RESET_VALUE,
+    maxDoublings: options.RESET_VALUE,
+  },
+};
diff --git a/spec/v1/providers/https.spec.ts b/spec/v1/providers/https.spec.ts
index 7046ad25e..7d06a15c3 100644
--- a/spec/v1/providers/https.spec.ts
+++ b/spec/v1/providers/https.spec.ts
@@ -20,126 +20,91 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-
-import * as functions from '../../../src/index';
-import * as https from '../../../src/providers/https';
-import {
-  expectedResponseHeaders,
-  MockRequest,
-} from '../../fixtures/mockrequest';
-import { runHandler } from '../../helper';
-
-describe('CloudHttpsBuilder', () => {
-  describe('#onRequest', () => {
-    it('should return a trigger with appropriate values', () => {
+import { expect } from "chai";
+
+import * as functions from "../../../src/v1";
+import * as https from "../../../src/v1/providers/https";
+import { expectedResponseHeaders, MockRequest } from "../../fixtures/mockrequest";
+import { runHandler } from "../../helper";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+
+describe("CloudHttpsBuilder", () => {
+  describe("#onRequest", () => {
+    it("should return a trigger with appropriate values", () => {
       const result = https.onRequest((req, resp) => {
         resp.send(200);
       });
-      expect(result.__trigger).to.deep.equal({ httpsTrigger: {} });
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         httpsTrigger: {},
       });
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
-          invoker: 'private',
+          memory: "256MB",
+          invoker: "private",
         })
         .https.onRequest(() => null);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
-      expect(fn.__trigger.httpsTrigger.invoker).to.deep.equal(['private']);
-
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
-      expect(fn.__endpoint.httpsTrigger.invoker).to.deep.equal(['private']);
-    });
-  });
-});
-
-describe('handler namespace', () => {
-  describe('#onRequest', () => {
-    it('should return an empty trigger', () => {
-      const result = functions.handler.https.onRequest((req, res) => {
-        res.send(200);
-      });
-      expect(result.__trigger).to.deep.equal({});
-      expect(result.__endpoint).to.be.undefined;
-    });
-  });
-
-  describe('#onCall', () => {
-    it('should return an empty trigger', () => {
-      const result = functions.handler.https.onCall(() => null);
-      expect(result.__trigger).to.deep.equal({});
-      expect(result.__endpoint).to.be.undefined;
+      expect(fn.__endpoint.httpsTrigger.invoker).to.deep.equal(["private"]);
     });
   });
 });
 
-describe('#onCall', () => {
-  it('should return a trigger/endpoint with appropriate values', () => {
-    const result = https.onCall((data) => {
-      return 'response';
-    });
-
-    expect(result.__trigger).to.deep.equal({
-      httpsTrigger: {},
-      labels: { 'deployment-callable': 'true' },
+describe("#onCall", () => {
+  it("should return a trigger/endpoint with appropriate values", () => {
+    const result = https.onCall(() => {
+      return "response";
     });
 
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       callableTrigger: {},
       labels: {},
     });
   });
 
-  it('should allow both region and runtime options to be set', () => {
+  it("should allow both region and runtime options to be set", () => {
     const fn = functions
-      .region('us-east1')
+      .region("us-east1")
       .runWith({
         timeoutSeconds: 90,
-        memory: '256MB',
+        memory: "256MB",
       })
       .https.onCall(() => null);
 
-    expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-    expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-    expect(fn.__trigger.timeout).to.deep.equal('90s');
-
-    expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+    expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
     expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
     expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
   });
 
-  it('has a .run method', () => {
+  it("has a .run method", () => {
     const cf = https.onCall((d, c) => {
       return { data: d, context: c };
     });
 
-    const data = 'data';
+    const data = "data";
     const context = {
-      instanceIdToken: 'token',
+      instanceIdToken: "token",
       auth: {
-        uid: 'abc',
-        token: 'token',
+        uid: "abc",
+        token: "token",
       },
     };
     expect(cf.run(data, context)).to.deep.equal({ data, context });
   });
 
   // Regression test for firebase-functions#947
-  it('should lock to the v1 API even with function.length == 1', async () => {
+  it("should lock to the v1 API even with function.length == 1", async () => {
     let gotData: Record<string, any>;
     const func = https.onCall((data) => {
       gotData = data;
@@ -147,61 +112,59 @@ describe('#onCall', () => {
 
     const req = new MockRequest(
       {
-        data: { foo: 'bar' },
+        data: { foo: "bar" },
       },
       {
-        'content-type': 'application/json',
+        "content-type": "application/json",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const response = await runHandler(func, req as any);
     expect(response.status).to.equal(200);
-    expect(gotData).to.deep.equal({ foo: 'bar' });
+    expect(gotData).to.deep.equal({ foo: "bar" });
   });
 });
 
-describe('callable CORS', () => {
-  it('handles OPTIONS preflight', async () => {
-    const func = https.onCall((data, context) => {
-      throw new Error(
-        `This shouldn't have gotten called for an OPTIONS preflight.`
-      );
+describe("callable CORS", () => {
+  it("handles OPTIONS preflight", async () => {
+    const func = https.onCall(() => {
+      throw new Error(`This shouldn't have gotten called for an OPTIONS preflight.`);
     });
 
     const req = new MockRequest(
       {},
       {
-        'Access-Control-Request-Method': 'POST',
-        'Access-Control-Request-Headers': 'origin',
-        Origin: 'example.com',
+        "Access-Control-Request-Method": "POST",
+        "Access-Control-Request-Headers": "origin",
+        Origin: "example.com",
       }
     );
-    req.method = 'OPTIONS';
+    req.method = "OPTIONS";
 
     const response = await runHandler(func, req as any);
 
     expect(response.status).to.equal(204);
     expect(response.body).to.be.undefined;
     expect(response.headers).to.deep.equal({
-      'Access-Control-Allow-Methods': 'POST',
-      'Content-Length': '0',
-      Vary: 'Origin, Access-Control-Request-Headers',
+      "Access-Control-Allow-Methods": "POST",
+      "Content-Length": "0",
+      Vary: "Origin, Access-Control-Request-Headers",
     });
   });
 
-  it('adds CORS headers', async () => {
-    const func = https.onCall((data, context) => 42);
+  it("adds CORS headers", async () => {
+    const func = https.onCall(() => 42);
     const req = new MockRequest(
       {
         data: {},
       },
       {
-        'content-type': 'application/json',
-        origin: 'example.com',
+        "content-type": "application/json",
+        origin: "example.com",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const response = await runHandler(func, req as any);
 
diff --git a/spec/v1/providers/pubsub.spec.ts b/spec/v1/providers/pubsub.spec.ts
index 5547515ab..573ac0f1c 100644
--- a/spec/v1/providers/pubsub.spec.ts
+++ b/spec/v1/providers/pubsub.spec.ts
@@ -20,37 +20,38 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { Event } from '../../../src/index';
-import * as functions from '../../../src/index';
-import * as pubsub from '../../../src/providers/pubsub';
-
-describe('Pubsub Functions', () => {
-  describe('pubsub.Message', () => {
-    describe('#json', () => {
-      it('should return json decoded from base64', () => {
+import { expect } from "chai";
+
+import { Event, RESET_VALUE } from "../../../src/v1";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+import { MINIMAL_SCHEDULE_TRIGGER } from "./fixtures";
+import * as functions from "../../../src/v1";
+import * as pubsub from "../../../src/v1/providers/pubsub";
+
+describe("Pubsub Functions", () => {
+  describe("pubsub.Message", () => {
+    describe("#json", () => {
+      it("should return json decoded from base64", () => {
         const message = new pubsub.Message({
-          data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'),
+          data: new Buffer('{"hello":"world"}', "utf8").toString("base64"),
         });
 
-        expect(message.json.hello).to.equal('world');
+        expect(message.json.hello).to.equal("world");
       });
 
-      it('should preserve passed in json', () => {
+      it("should preserve passed in json", () => {
         const message = new pubsub.Message({
-          data: new Buffer('{"hello":"world"}', 'utf8').toString('base64'),
-          json: { goodbye: 'world' },
+          data: new Buffer('{"hello":"world"}', "utf8").toString("base64"),
+          json: { goodbye: "world" },
         });
 
-        expect(message.json.goodbye).to.equal('world');
+        expect(message.json.goodbye).to.equal("world");
       });
     });
 
-    describe('#toJSON', () => {
-      it('should be JSON stringify-able', () => {
-        const encoded = new Buffer('{"hello":"world"}', 'utf8').toString(
-          'base64'
-        );
+    describe("#toJSON", () => {
+      it("should be JSON stringify-able", () => {
+        const encoded = new Buffer('{"hello":"world"}', "utf8").toString("base64");
         const message = new pubsub.Message({
           data: encoded,
         });
@@ -63,53 +64,42 @@ describe('Pubsub Functions', () => {
     });
   });
 
-  describe('pubsub.FunctionBuilder', () => {
+  describe("pubsub.FunctionBuilder", () => {
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
     });
 
     after(() => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
-        .pubsub.topic('toppy')
+        .pubsub.topic("toppy")
         .onPublish(() => null);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
-
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
 
-    describe('#onPublish', () => {
-      it('should return a trigger/endpoint with appropriate values', () => {
+    describe("#onPublish", () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
         // Pick up project from process.env.GCLOUD_PROJECT
-        const result = pubsub.topic('toppy').onPublish(() => null);
-
-        expect(result.__trigger).to.deep.equal({
-          eventTrigger: {
-            eventType: 'google.pubsub.topic.publish',
-            resource: 'projects/project1/topics/toppy',
-            service: 'pubsub.googleapis.com',
-          },
-        });
+        const result = pubsub.topic("toppy").onPublish(() => null);
 
         expect(result.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           eventTrigger: {
-            eventType: 'google.pubsub.topic.publish',
+            eventType: "google.pubsub.topic.publish",
             eventFilters: {
-              resource: 'projects/project1/topics/toppy',
+              resource: "projects/project1/topics/toppy",
             },
             retry: false,
           },
@@ -117,31 +107,31 @@ describe('Pubsub Functions', () => {
         });
       });
 
-      it('should throw with improperly formatted topics', () => {
-        expect(() => pubsub.topic('bad/topic/format')).to.throw(Error);
+      it("should throw with improperly formatted topics", () => {
+        expect(() => pubsub.topic("bad/topic/format")).to.throw(Error);
       });
 
-      it('should properly handle a new-style event', () => {
-        const raw = new Buffer('{"hello":"world"}', 'utf8').toString('base64');
+      it("should properly handle a new-style event", () => {
+        const raw = new Buffer('{"hello":"world"}', "utf8").toString("base64");
         const event: Event = {
           data: {
             data: raw,
             attributes: {
-              foo: 'bar',
+              foo: "bar",
             },
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.pubsub.topic.publish',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "google.pubsub.topic.publish",
             resource: {
-              service: 'pubsub.googleapis.com',
-              name: 'projects/project1/topics/toppy',
+              service: "pubsub.googleapis.com",
+              name: "projects/project1/topics/toppy",
             },
           },
         };
 
-        const result = pubsub.topic('toppy').onPublish((data, context) => {
+        const result = pubsub.topic("toppy").onPublish((data) => {
           return {
             raw: data.data,
             json: data.json,
@@ -149,347 +139,197 @@ describe('Pubsub Functions', () => {
           };
         });
 
-        return expect(
-          result(event.data, event.context)
-        ).to.eventually.deep.equal({
+        return expect(result(event.data, event.context)).to.eventually.deep.equal({
           raw,
-          json: { hello: 'world' },
-          attributes: { foo: 'bar' },
+          json: { hello: "world" },
+          attributes: { foo: "bar" },
         });
       });
     });
 
-    describe('#schedule', () => {
-      it('should return a trigger/endpoint with schedule', () => {
-        const result = pubsub
-          .schedule('every 5 minutes')
-          .onRun((context) => null);
-
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-        });
+    describe("#schedule", () => {
+      it("should return a trigger/endpoint with schedule", () => {
+        const result = pubsub.schedule("every 5 minutes").onRun(() => null);
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
         });
       });
 
-      it('should return a trigger/endpoint with schedule and timeZone when one is chosen', () => {
+      it("should return a trigger/endpoint with schedule and timeZone when one is chosen", () => {
         const result = pubsub
-          .schedule('every 5 minutes')
-          .timeZone('America/New_York')
-          .onRun((context) => null);
-
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
-        });
+          .schedule("every 5 minutes")
+          .timeZone("America/New_York")
+          .onRun(() => null);
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
+          timeZone: "America/New_York",
         });
       });
 
-      it('should return a trigger/endpoint with schedule and retry config when called with retryConfig', () => {
+      it("should return a trigger/endpoint with schedule and retry config when called with retryConfig", () => {
         const retryConfig = {
           retryCount: 3,
-          maxRetryDuration: '10 minutes',
-          minBackoffDuration: '10 minutes',
-          maxBackoffDuration: '10 minutes',
+          maxRetryDuration: "10 minutes",
+          minBackoffDuration: "10 minutes",
+          maxBackoffDuration: "10 minutes",
           maxDoublings: 5,
         };
         const result = pubsub
-          .schedule('every 5 minutes')
+          .schedule("every 5 minutes")
           .retryConfig(retryConfig)
           .onRun(() => null);
 
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-          retryConfig,
-        });
-        expect(result.__trigger.labels).to.deep.equal({
-          'deployment-scheduled': 'true',
-        });
-
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
           retryConfig,
         });
         expect(result.__endpoint.labels).to.be.empty;
       });
 
       it(
-        'should return a trigger/endpoint with schedule, timeZone and retry config' +
-          'when called with retryConfig and timeout',
+        "should return a trigger/endpoint with schedule, timeZone and retry config" +
+          "when called with retryConfig and timeout",
         () => {
           const retryConfig = {
             retryCount: 3,
-            maxRetryDuration: '10 minutes',
-            minBackoffDuration: '10 minutes',
-            maxBackoffDuration: '10 minutes',
+            maxRetryDuration: "10 minutes",
+            minBackoffDuration: "10 minutes",
+            maxBackoffDuration: "10 minutes",
             maxDoublings: 5,
           };
           const result = pubsub
-            .schedule('every 5 minutes')
-            .timeZone('America/New_York')
+            .schedule("every 5 minutes")
+            .timeZone("America/New_York")
             .retryConfig(retryConfig)
             .onRun(() => null);
 
-          expect(result.__trigger.schedule).to.deep.equal({
-            schedule: 'every 5 minutes',
-            retryConfig,
-            timeZone: 'America/New_York',
-          });
-          expect(result.__trigger.labels).to.deep.equal({
-            'deployment-scheduled': 'true',
-          });
-
           expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-            schedule: 'every 5 minutes',
+            ...MINIMAL_SCHEDULE_TRIGGER,
+            schedule: "every 5 minutes",
             retryConfig,
-            timeZone: 'America/New_York',
+            timeZone: "America/New_York",
           });
           expect(result.__endpoint.labels).to.be.empty;
         }
       );
 
-      it('should return an appropriate trigger/endpoint when called with region and options', () => {
+      it("should return an appropriate trigger/endpoint when called with region and options", () => {
         const result = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
-          .pubsub.schedule('every 5 minutes')
+          .pubsub.schedule("every 5 minutes")
           .onRun(() => null);
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-        });
-        expect(result.__trigger.regions).to.deep.equal(['us-east1']);
-        expect(result.__trigger.availableMemoryMb).to.deep.equal(256);
-        expect(result.__trigger.timeout).to.deep.equal('90s');
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
         });
-        expect(result.__endpoint.region).to.deep.equal(['us-east1']);
+        expect(result.__endpoint.region).to.deep.equal(["us-east1"]);
         expect(result.__endpoint.availableMemoryMb).to.deep.equal(256);
         expect(result.__endpoint.timeoutSeconds).to.deep.equal(90);
       });
 
-      it('should return an appropriate trigger/endpoint when called with region, timeZone, and options', () => {
+      it("should return an appropriate trigger/endpoint when called with region, timeZone, and options", () => {
         const result = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
-          .pubsub.schedule('every 5 minutes')
-          .timeZone('America/New_York')
+          .pubsub.schedule("every 5 minutes")
+          .timeZone("America/New_York")
           .onRun(() => null);
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
-        });
-        expect(result.__trigger.regions).to.deep.equal(['us-east1']);
-        expect(result.__trigger.availableMemoryMb).to.deep.equal(256);
-        expect(result.__trigger.timeout).to.deep.equal('90s');
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
+          timeZone: "America/New_York",
         });
-        expect(result.__endpoint.region).to.deep.equal(['us-east1']);
+        expect(result.__endpoint.region).to.deep.equal(["us-east1"]);
         expect(result.__endpoint.availableMemoryMb).to.deep.equal(256);
         expect(result.__endpoint.timeoutSeconds).to.deep.equal(90);
       });
 
-      it('should return an appropriate trigger/endpoint when called with region, options and retryConfig', () => {
+      it("should return an appropriate trigger/endpoint when called with region, options and retryConfig", () => {
         const retryConfig = {
           retryCount: 3,
-          maxRetryDuration: '10 minutes',
-          minBackoffDuration: '10 minutes',
-          maxBackoffDuration: '10 minutes',
+          maxRetryDuration: "10 minutes",
+          minBackoffDuration: "10 minutes",
+          maxBackoffDuration: "10 minutes",
           maxDoublings: 5,
         };
         const result = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
-          .pubsub.schedule('every 5 minutes')
+          .pubsub.schedule("every 5 minutes")
           .retryConfig(retryConfig)
           .onRun(() => null);
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-          retryConfig,
-        });
-        expect(result.__trigger.labels).to.deep.equal({
-          'deployment-scheduled': 'true',
-        });
-        expect(result.__trigger.regions).to.deep.equal(['us-east1']);
-        expect(result.__trigger.availableMemoryMb).to.deep.equal(256);
-        expect(result.__trigger.timeout).to.deep.equal('90s');
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
+          timeZone: RESET_VALUE,
           retryConfig,
         });
-        expect(result.__endpoint.region).to.deep.equal(['us-east1']);
+        expect(result.__endpoint.region).to.deep.equal(["us-east1"]);
         expect(result.__endpoint.availableMemoryMb).to.deep.equal(256);
         expect(result.__endpoint.timeoutSeconds).to.deep.equal(90);
       });
 
-      it('should return an appropriate trigger/endpoint when called with region, options, retryConfig, and timeZone', () => {
+      it("should return an appropriate trigger/endpoint when called with region, options, retryConfig, and timeZone", () => {
         const retryConfig = {
           retryCount: 3,
-          maxRetryDuration: '10 minutes',
-          minBackoffDuration: '10 minutes',
-          maxBackoffDuration: '10 minutes',
+          maxRetryDuration: "10 minutes",
+          minBackoffDuration: "10 minutes",
+          maxBackoffDuration: "10 minutes",
           maxDoublings: 5,
         };
         const result = functions
-          .region('us-east1')
+          .region("us-east1")
           .runWith({
             timeoutSeconds: 90,
-            memory: '256MB',
+            memory: "256MB",
           })
-          .pubsub.schedule('every 5 minutes')
-          .timeZone('America/New_York')
+          .pubsub.schedule("every 5 minutes")
+          .timeZone("America/New_York")
           .retryConfig(retryConfig)
           .onRun(() => null);
-        expect(result.__trigger.schedule).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
-          retryConfig,
-        });
-        expect(result.__trigger.labels).to.deep.equal({
-          'deployment-scheduled': 'true',
-        });
-        expect(result.__trigger.regions).to.deep.equal(['us-east1']);
-        expect(result.__trigger.availableMemoryMb).to.deep.equal(256);
-        expect(result.__trigger.timeout).to.deep.equal('90s');
 
         expect(result.__endpoint.scheduleTrigger).to.deep.equal({
-          schedule: 'every 5 minutes',
-          timeZone: 'America/New_York',
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "every 5 minutes",
+          timeZone: "America/New_York",
           retryConfig,
         });
-        expect(result.__endpoint.region).to.deep.equal(['us-east1']);
+        expect(result.__endpoint.region).to.deep.equal(["us-east1"]);
         expect(result.__endpoint.availableMemoryMb).to.deep.equal(256);
         expect(result.__endpoint.timeoutSeconds).to.deep.equal(90);
       });
     });
   });
 
-  describe('handler namespace', () => {
-    describe('#onPublish', () => {
-      describe('#topic', () => {
-        it('should return an empty trigger', () => {
-          const result = functions.handler.pubsub.topic.onPublish(() => null);
-          expect(result.__trigger).to.deep.equal({});
-          expect(result.__endpoint).to.be.undefined;
-        });
-
-        it('should properly handle a new-style event', () => {
-          const raw = new Buffer('{"hello":"world"}', 'utf8').toString(
-            'base64'
-          );
-          const event = {
-            data: {
-              data: raw,
-              attributes: {
-                foo: 'bar',
-              },
-            },
-            context: {
-              eventId: '70172329041928',
-              timestamp: '2018-04-09T07:56:12.975Z',
-              eventType: 'google.pubsub.topic.publish',
-              resource: {
-                service: 'pubsub.googleapis.com',
-                name: 'projects/project1/topics/toppy',
-              },
-            },
-          };
-
-          const result = functions.handler.pubsub.topic.onPublish((data) => {
-            return {
-              raw: data.data,
-              json: data.json,
-              attributes: data.attributes,
-            };
-          });
-
-          return expect(
-            result(event.data, event.context)
-          ).to.eventually.deep.equal({
-            raw,
-            json: { hello: 'world' },
-            attributes: { foo: 'bar' },
-          });
-        });
-      });
-      describe('#schedule', () => {
-        it('should return an empty trigger', () => {
-          const result = functions.handler.pubsub.schedule.onRun(() => null);
-          expect(result.__trigger).to.deep.equal({});
-        });
-        it('should return a handler with a proper event context', () => {
-          const raw = new Buffer('{"hello":"world"}', 'utf8').toString(
-            'base64'
-          );
-          const event = {
-            data: {
-              data: raw,
-              attributes: {
-                foo: 'bar',
-              },
-            },
-            context: {
-              eventId: '70172329041928',
-              timestamp: '2018-04-09T07:56:12.975Z',
-              eventType: 'google.pubsub.topic.publish',
-              resource: {
-                service: 'pubsub.googleapis.com',
-                name: 'projects/project1/topics/toppy',
-              },
-            },
-          };
-          const result = functions.handler.pubsub.schedule.onRun(
-            (context) => context.eventId
-          );
-          return expect(result(event.data, event.context)).to.eventually.equal(
-            '70172329041928'
-          );
-        });
-      });
-    });
-  });
-
-  describe('process.env.GCLOUD_PROJECT not set', () => {
-    it('should not throw if __trigger is not accessed', () => {
-      expect(() => pubsub.topic('toppy').onPublish(() => null)).to.not.throw(
-        Error
-      );
-    });
-
-    it('should throw when trigger is accessed', () => {
-      expect(
-        () => pubsub.topic('toppy').onPublish(() => null).__trigger
-      ).to.throw(Error);
+  describe("process.env.GCLOUD_PROJECT not set", () => {
+    it("should not throw if __endpoint is not accessed", () => {
+      expect(() => pubsub.topic("toppy").onPublish(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when endpoint is accessed', () => {
-      expect(
-        () => pubsub.topic('toppy').onPublish(() => null).__endpoint
-      ).to.throw(Error);
+    it("should throw when endpoint is accessed", () => {
+      expect(() => pubsub.topic("toppy").onPublish(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
-      const cf = pubsub.topic('toppy').onPublish(() => null);
+    it("should not throw when #run is called", () => {
+      const cf = pubsub.topic("toppy").onPublish(() => null);
       expect(cf.run).to.not.throw(Error);
     });
   });
diff --git a/spec/v1/providers/remoteConfig.spec.ts b/spec/v1/providers/remoteConfig.spec.ts
index f3fde2043..45d13bb32 100644
--- a/spec/v1/providers/remoteConfig.spec.ts
+++ b/spec/v1/providers/remoteConfig.spec.ts
@@ -19,57 +19,47 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-} from '../../../src/cloud-functions';
-import * as functions from '../../../src/index';
-import * as remoteConfig from '../../../src/providers/remoteConfig';
+import * as functions from "../../../src/v1";
+import { CloudFunction, Event } from "../../../src/v1/cloud-functions";
+import * as remoteConfig from "../../../src/v1/providers/remoteConfig";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
 
-describe('RemoteConfig Functions', () => {
+describe("RemoteConfig Functions", () => {
   function constructVersion() {
     return {
       versionNumber: 1,
-      updateTime: '2017-07-02T18:48:58.920638Z',
+      updateTime: "2017-07-02T18:48:58.920638Z",
       updateUser: {
-        name: 'Foo Bar',
-        email: 'foobar@gmail.com',
+        name: "Foo Bar",
+        email: "foobar@gmail.com",
       },
-      description: 'test description',
-      updateOrigin: 'CONSOLE',
-      updateType: 'INCREMENTAL_UPDATE',
+      description: "test description",
+      updateOrigin: "CONSOLE",
+      updateType: "INCREMENTAL_UPDATE",
     };
   }
 
-  describe('#onUpdate', () => {
+  describe("#onUpdate", () => {
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
     });
 
     after(() => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should have the correct trigger', () => {
+    it("should have the correct trigger", () => {
       const cloudFunction = remoteConfig.onUpdate(() => null);
 
-      expect(cloudFunction.__trigger).to.deep.equal({
-        eventTrigger: {
-          resource: 'projects/project1',
-          eventType: 'google.firebase.remoteconfig.update',
-          service: 'firebaseremoteconfig.googleapis.com',
-        },
-      });
-
       expect(cloudFunction.__endpoint).to.deep.equal({
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         eventTrigger: {
-          eventType: 'google.firebase.remoteconfig.update',
+          eventType: "google.firebase.remoteconfig.update",
           eventFilters: {
-            resource: 'projects/project1',
+            resource: "projects/project1",
           },
           retry: false,
         },
@@ -77,45 +67,40 @@ describe('RemoteConfig Functions', () => {
       });
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const cloudFunction = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
         .remoteConfig.onUpdate(() => null);
 
-      expect(cloudFunction.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(cloudFunction.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(cloudFunction.__trigger.timeout).to.deep.equal('90s');
-
-      expect(cloudFunction.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(cloudFunction.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(cloudFunction.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(cloudFunction.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
   });
 
-  describe('unwraps TemplateVersion', () => {
+  describe("unwraps TemplateVersion", () => {
     let cloudFunctionUpdate: CloudFunction<remoteConfig.TemplateVersion>;
     let event: Event;
 
     before(() => {
-      process.env.GCLOUD_PROJECT = 'project1';
+      process.env.GCLOUD_PROJECT = "project1";
       cloudFunctionUpdate = remoteConfig.onUpdate(
-        (version: remoteConfig.TemplateVersion, context: EventContext) =>
-          version
+        (version: remoteConfig.TemplateVersion) => version
       );
 
       event = {
         data: constructVersion(),
         context: {
-          eventId: '70172329041928',
-          timestamp: '2018-04-09T07:56:12.975Z',
-          eventType: 'google.firebase.remoteconfig.update',
+          eventId: "70172329041928",
+          timestamp: "2018-04-09T07:56:12.975Z",
+          eventType: "google.firebase.remoteconfig.update",
           resource: {
-            service: 'firebaseremoteconfig.googleapis.com',
-            name: 'projects/project1',
+            service: "firebaseremoteconfig.googleapis.com",
+            name: "projects/project1",
           },
         },
       };
@@ -125,54 +110,12 @@ describe('RemoteConfig Functions', () => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should unwrap the version in the event', () => {
+    it("should unwrap the version in the event", () => {
       return Promise.all([
-        cloudFunctionUpdate(event.data, event.context).then(
-          (data: any, context: any) => {
-            expect(data).to.deep.equal(constructVersion());
-          }
-        ),
+        cloudFunctionUpdate(event.data, event.context).then((data: any) => {
+          expect(data).to.deep.equal(constructVersion());
+        }),
       ]);
     });
   });
-
-  describe('handler namespace', () => {
-    describe('#onUpdate', () => {
-      it('should have an empty trigger', () => {
-        const cloudFunction = functions.handler.remoteConfig.onUpdate(
-          () => null
-        );
-
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should correctly unwrap the event', () => {
-        const cloudFunctionUpdate = functions.handler.remoteConfig.onUpdate(
-          (version: remoteConfig.TemplateVersion, context: EventContext) =>
-            version
-        );
-        const event: Event = {
-          data: constructVersion(),
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.firebase.remoteconfig.update',
-            resource: {
-              service: 'firebaseremoteconfig.googleapis.com',
-              name: 'projects/project1',
-            },
-          },
-        };
-
-        return Promise.all([
-          cloudFunctionUpdate(event.data, event.context).then(
-            (data: any, context: any) => {
-              expect(data).to.deep.equal(constructVersion());
-            }
-          ),
-        ]);
-      });
-    });
-  });
 });
diff --git a/spec/v1/providers/storage.spec.ts b/spec/v1/providers/storage.spec.ts
index d96b131b9..0055e8769 100644
--- a/spec/v1/providers/storage.spec.ts
+++ b/spec/v1/providers/storage.spec.ts
@@ -20,27 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { Event, EventContext } from '../../../src';
-import * as functions from '../../../src';
-import * as config from '../../../src/config';
-import * as storage from '../../../src/providers/storage';
-
-describe('Storage Functions', () => {
-  describe('ObjectBuilder', () => {
-    function expectedTrigger(bucket: string, eventType: string) {
-      return {
-        eventTrigger: {
-          resource: `projects/_/buckets/${bucket}`,
-          eventType: `google.storage.object.${eventType}`,
-          service: 'storage.googleapis.com',
-        },
-      };
-    }
-
+import { expect } from "chai";
+import { Event } from "../../../src/v1";
+import * as config from "../../../src/common/config";
+import * as functions from "../../../src/v1";
+import * as storage from "../../../src/v1/providers/storage";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+
+describe("Storage Functions", () => {
+  describe("ObjectBuilder", () => {
     function expectedEndpoint(bucket: string, eventType: string) {
       return {
-        platform: 'gcfv1',
+        ...MINIMAL_V1_ENDPOINT,
+        platform: "gcfv1",
         eventTrigger: {
           eventFilters: {
             resource: `projects/_/buckets/${bucket}`,
@@ -52,579 +44,292 @@ describe('Storage Functions', () => {
       };
     }
 
-    const defaultBucket = 'bucket';
+    const defaultBucket = "bucket";
 
     before(() => {
-      (config as any).firebaseConfigCache = {
+      config.resetCache({
         storageBucket: defaultBucket,
-      };
+      });
     });
 
     after(() => {
-      (config as any).firebaseConfigcache = null;
+      config.resetCache();
     });
 
-    it('should allow both region and runtime options to be set', () => {
+    it("should allow both region and runtime options to be set", () => {
       const fn = functions
-        .region('us-east1')
+        .region("us-east1")
         .runWith({
           timeoutSeconds: 90,
-          memory: '256MB',
+          memory: "256MB",
         })
         .storage.object()
         .onArchive(() => null);
 
-      expect(fn.__trigger.regions).to.deep.equal(['us-east1']);
-      expect(fn.__trigger.availableMemoryMb).to.deep.equal(256);
-      expect(fn.__trigger.timeout).to.deep.equal('90s');
-
-      expect(fn.__endpoint.region).to.deep.equal(['us-east1']);
+      expect(fn.__endpoint.region).to.deep.equal(["us-east1"]);
       expect(fn.__endpoint.availableMemoryMb).to.deep.equal(256);
       expect(fn.__endpoint.timeoutSeconds).to.deep.equal(90);
     });
 
-    describe('#onArchive', () => {
-      it('should return a TriggerDefinition with appropriate values', () => {
+    describe("#onArchive", () => {
+      it("should return a TriggerDefinition with appropriate values", () => {
         const cloudFunction = storage
-          .bucket('bucky')
+          .bucket("bucky")
           .object()
           .onArchive(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'archive')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'archive')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint("bucky", "archive"));
       });
 
-      it('should use the default bucket when none is provided', () => {
+      it("should use the default bucket when none is provided", () => {
         const cloudFunction = storage.object().onArchive(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(defaultBucket, 'archive')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(defaultBucket, 'archive')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(defaultBucket, "archive"));
       });
 
-      it('should allow fully qualified bucket names', () => {
-        const subjectQualified = new storage.ObjectBuilder(
-          () => 'projects/_/buckets/bucky',
-          {}
-        );
+      it("should allow fully qualified bucket names", () => {
+        const subjectQualified = new storage.ObjectBuilder(() => "projects/_/buckets/bucky", {});
         const result = subjectQualified.onArchive(() => null);
 
-        expect(result.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'archive')
-        );
-
-        expect(result.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'archive')
-        );
+        expect(result.__endpoint).to.deep.equal(expectedEndpoint("bucky", "archive"));
       });
 
-      it('should throw with improperly formatted buckets', () => {
-        expect(
-          () =>
-            storage
-              .bucket('bad/bucket/format')
-              .object()
-              .onArchive(() => null).__trigger
-        ).to.throw(Error);
-
+      it("should throw with improperly formatted buckets", () => {
         expect(
           () =>
             storage
-              .bucket('bad/bucket/format')
+              .bucket("bad/bucket/format")
               .object()
               .onArchive(() => null).__endpoint
         ).to.throw(Error);
       });
 
-      it('should not mess with media links using non-literal slashes', () => {
+      it("should not mess with media links using non-literal slashes", () => {
         const cloudFunction = storage.object().onArchive((data) => {
           return data.mediaLink;
         });
         const goodMediaLinkEvent: Event = {
           data: {
             mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
+              "https://www.googleapis.com/storage/v1/b/mybucket.appspot.com" +
+              "/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media",
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.archive',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "google.storage.object.archive",
             resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
+              service: "storage.googleapis.com",
+              name: "projects/_/buckets/bucky",
             },
           },
         };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
+        return cloudFunction(goodMediaLinkEvent.data, goodMediaLinkEvent.context).then(
+          (result: any) => {
+            expect(result).equals(goodMediaLinkEvent.data.mediaLink);
+          }
+        );
       });
     });
 
-    describe('#onDelete', () => {
-      it('should return a TriggerDefinition with appropriate values', () => {
+    describe("#onDelete", () => {
+      it("should return a TriggerDefinition with appropriate values", () => {
         const cloudFunction = storage
-          .bucket('bucky')
+          .bucket("bucky")
           .object()
           .onDelete(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'delete')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'delete')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint("bucky", "delete"));
       });
 
-      it('should use the default bucket when none is provided', () => {
+      it("should use the default bucket when none is provided", () => {
         const cloudFunction = storage.object().onDelete(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(defaultBucket, 'delete')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(defaultBucket, 'delete')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(defaultBucket, "delete"));
       });
 
-      it('should allow fully qualified bucket names', () => {
-        const subjectQualified = new storage.ObjectBuilder(
-          () => 'projects/_/buckets/bucky',
-          {}
-        );
+      it("should allow fully qualified bucket names", () => {
+        const subjectQualified = new storage.ObjectBuilder(() => "projects/_/buckets/bucky", {});
         const result = subjectQualified.onDelete(() => null);
 
-        expect(result.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'delete')
-        );
-
-        expect(result.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'delete')
-        );
+        expect(result.__endpoint).to.deep.equal(expectedEndpoint("bucky", "delete"));
       });
 
-      it('should throw with improperly formatted buckets', () => {
+      it("should throw with improperly formatted buckets", () => {
         const fn = storage
-          .bucket('bad/bucket/format')
+          .bucket("bad/bucket/format")
           .object()
           .onDelete(() => null);
 
-        expect(() => fn.__trigger).to.throw(Error);
-
         expect(() => fn.__endpoint).to.throw(Error);
       });
 
-      it('should not mess with media links using non-literal slashes', () => {
+      it("should not mess with media links using non-literal slashes", () => {
         const cloudFunction = storage.object().onDelete((data) => {
           return data.mediaLink;
         });
         const goodMediaLinkEvent = {
           data: {
             mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
+              "https://www.googleapis.com/storage/v1/b/mybucket.appspot.com" +
+              "/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media",
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.delete',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "google.storage.object.delete",
             resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
+              service: "storage.googleapis.com",
+              name: "projects/_/buckets/bucky",
             },
           },
         };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
+        return cloudFunction(goodMediaLinkEvent.data, goodMediaLinkEvent.context).then(
+          (result: any) => {
+            expect(result).equals(goodMediaLinkEvent.data.mediaLink);
+          }
+        );
       });
     });
 
-    describe('#onFinalize', () => {
-      it('should return a TriggerDefinition with appropriate values', () => {
+    describe("#onFinalize", () => {
+      it("should return a TriggerDefinition with appropriate values", () => {
         const cloudFunction = storage
-          .bucket('bucky')
+          .bucket("bucky")
           .object()
           .onFinalize(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'finalize')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'finalize')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint("bucky", "finalize"));
       });
 
-      it('should use the default bucket when none is provided', () => {
+      it("should use the default bucket when none is provided", () => {
         const cloudFunction = storage.object().onFinalize(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(defaultBucket, 'finalize')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(defaultBucket, 'finalize')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint(defaultBucket, "finalize"));
       });
 
-      it('should allow fully qualified bucket names', () => {
-        const subjectQualified = new storage.ObjectBuilder(
-          () => 'projects/_/buckets/bucky',
-          {}
-        );
+      it("should allow fully qualified bucket names", () => {
+        const subjectQualified = new storage.ObjectBuilder(() => "projects/_/buckets/bucky", {});
         const result = subjectQualified.onFinalize(() => null);
 
-        expect(result.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'finalize')
-        );
-
-        expect(result.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'finalize')
-        );
+        expect(result.__endpoint).to.deep.equal(expectedEndpoint("bucky", "finalize"));
       });
 
-      it('should throw with improperly formatted buckets', () => {
+      it("should throw with improperly formatted buckets", () => {
         const fn = storage
-          .bucket('bad/bucket/format')
+          .bucket("bad/bucket/format")
           .object()
           .onFinalize(() => null);
 
-        expect(() => fn.__trigger).to.throw(Error);
-
         expect(() => fn.__endpoint).to.throw(Error);
       });
 
-      it('should not mess with media links using non-literal slashes', () => {
+      it("should not mess with media links using non-literal slashes", () => {
         const cloudFunction = storage.object().onFinalize((data) => {
           return data.mediaLink;
         });
         const goodMediaLinkEvent = {
           data: {
             mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
+              "https://www.googleapis.com/storage/v1/b/mybucket.appspot.com" +
+              "/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media",
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.finalize',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "google.storage.object.finalize",
             resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
+              service: "storage.googleapis.com",
+              name: "projects/_/buckets/bucky",
             },
           },
         };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
+        return cloudFunction(goodMediaLinkEvent.data, goodMediaLinkEvent.context).then(
+          (result: any) => {
+            expect(result).equals(goodMediaLinkEvent.data.mediaLink);
+          }
+        );
       });
     });
 
-    describe('#onMetadataUpdate', () => {
-      it('should return a TriggerDefinition with appropriate values', () => {
+    describe("#onMetadataUpdate", () => {
+      it("should return a TriggerDefinition with appropriate values", () => {
         const cloudFunction = storage
-          .bucket('bucky')
+          .bucket("bucky")
           .object()
           .onMetadataUpdate(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'metadataUpdate')
-        );
-
-        expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'metadataUpdate')
-        );
+        expect(cloudFunction.__endpoint).to.deep.equal(expectedEndpoint("bucky", "metadataUpdate"));
       });
 
-      it('should use the default bucket when none is provided', () => {
+      it("should use the default bucket when none is provided", () => {
         const cloudFunction = storage.object().onMetadataUpdate(() => null);
 
-        expect(cloudFunction.__trigger).to.deep.equal(
-          expectedTrigger(defaultBucket, 'metadataUpdate')
-        );
-
         expect(cloudFunction.__endpoint).to.deep.equal(
-          expectedEndpoint(defaultBucket, 'metadataUpdate')
+          expectedEndpoint(defaultBucket, "metadataUpdate")
         );
       });
 
-      it('should allow fully qualified bucket names', () => {
-        const subjectQualified = new storage.ObjectBuilder(
-          () => 'projects/_/buckets/bucky',
-          {}
-        );
+      it("should allow fully qualified bucket names", () => {
+        const subjectQualified = new storage.ObjectBuilder(() => "projects/_/buckets/bucky", {});
         const result = subjectQualified.onMetadataUpdate(() => null);
 
-        expect(result.__trigger).to.deep.equal(
-          expectedTrigger('bucky', 'metadataUpdate')
-        );
-
-        expect(result.__endpoint).to.deep.equal(
-          expectedEndpoint('bucky', 'metadataUpdate')
-        );
+        expect(result.__endpoint).to.deep.equal(expectedEndpoint("bucky", "metadataUpdate"));
       });
 
-      it('should throw with improperly formatted buckets', () => {
+      it("should throw with improperly formatted buckets", () => {
         const fn = storage
-          .bucket('bad/bucket/format')
+          .bucket("bad/bucket/format")
           .object()
           .onMetadataUpdate(() => null);
 
-        expect(() => fn.__trigger).to.throw(Error);
         expect(() => fn.__endpoint).to.throw(Error);
       });
 
-      it('should not mess with media links using non-literal slashes', () => {
+      it("should not mess with media links using non-literal slashes", () => {
         const cloudFunction = storage.object().onMetadataUpdate((data) => {
           return data.mediaLink;
         });
         const goodMediaLinkEvent = {
           data: {
             mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
+              "https://www.googleapis.com/storage/v1/b/mybucket.appspot.com" +
+              "/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media",
           },
           context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.metadataUpdate',
+            eventId: "70172329041928",
+            timestamp: "2018-04-09T07:56:12.975Z",
+            eventType: "google.storage.object.metadataUpdate",
             resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
+              service: "storage.googleapis.com",
+              name: "projects/_/buckets/bucky",
             },
           },
         };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
-      });
-    });
-  });
-
-  describe('namespace handler', () => {
-    before(() => {
-      process.env.FIREBASE_CONFIG = JSON.stringify({
-        storageBucket: 'bucket',
-      });
-    });
-
-    after(() => {
-      delete process.env.FIREBASE_CONFIG;
-    });
-
-    describe('#onArchive', () => {
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.storage.bucket.onArchive(
-          () => null
-        );
-
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should not mess with media links using non-literal slashes', () => {
-        const cloudFunction = functions.handler.storage.object.onArchive(
-          (data) => {
-            return data.mediaLink;
-          }
-        );
-        const goodMediaLinkEvent = {
-          data: {
-            mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
-          },
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.archive',
-            resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
-            },
-          },
-        };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
-      });
-    });
-
-    describe('#onDelete', () => {
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.storage.bucket.onDelete(
-          () => null
-        );
-
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should not mess with media links using non-literal slashes', () => {
-        const cloudFunction = functions.handler.storage.object.onDelete(
-          (data) => {
-            return data.mediaLink;
+        return cloudFunction(goodMediaLinkEvent.data, goodMediaLinkEvent.context).then(
+          (result: any) => {
+            expect(result).equals(goodMediaLinkEvent.data.mediaLink);
           }
         );
-        const goodMediaLinkEvent = {
-          data: {
-            mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
-          },
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.delete',
-            resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
-            },
-          },
-        };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
-      });
-    });
-
-    describe('#onFinalize', () => {
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.storage.bucket.onFinalize(
-          () => null
-        );
-
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should not mess with media links using non-literal slashes', () => {
-        const cloudFunction = functions.handler.storage.object.onFinalize(
-          (data) => {
-            return data.mediaLink;
-          }
-        );
-        const goodMediaLinkEvent = {
-          data: {
-            mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
-          },
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.finalize',
-            resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
-            },
-          },
-        };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
-      });
-    });
-
-    describe('#onMetadataUpdate', () => {
-      it('should return an empty trigger', () => {
-        const cloudFunction = functions.handler.storage.bucket.onMetadataUpdate(
-          () => null
-        );
-
-        expect(cloudFunction.__trigger).to.deep.equal({});
-        expect(cloudFunction.__endpoint).to.be.undefined;
-      });
-
-      it('should not mess with media links using non-literal slashes', () => {
-        const cloudFunction = functions.handler.storage.object.onMetadataUpdate(
-          (data) => {
-            return data.mediaLink;
-          }
-        );
-        const goodMediaLinkEvent = {
-          data: {
-            mediaLink:
-              'https://www.googleapis.com/storage/v1/b/mybucket.appspot.com' +
-              '/o/nestedfolder%2Fanotherfolder%2Fmyobject.file?generation=12345&alt=media',
-          },
-          context: {
-            eventId: '70172329041928',
-            timestamp: '2018-04-09T07:56:12.975Z',
-            eventType: 'google.storage.object.metadataUpdate',
-            resource: {
-              service: 'storage.googleapis.com',
-              name: 'projects/_/buckets/bucky',
-            },
-          },
-        };
-        return cloudFunction(
-          goodMediaLinkEvent.data,
-          goodMediaLinkEvent.context
-        ).then((result: any, context: EventContext) => {
-          expect(result).equals(goodMediaLinkEvent.data.mediaLink);
-        });
       });
     });
   });
 
-  describe('process.env.FIREBASE_CONFIG not set', () => {
+  describe("process.env.FIREBASE_CONFIG not set", () => {
     beforeEach(() => {
       (config as any).firebaseConfigCache = null;
       delete process.env.FIREBASE_CONFIG;
     });
 
-    it('should not throw if __trigger is not accessed', () => {
+    it("should not throw if __endpoint is not accessed", () => {
       expect(() => storage.object().onArchive(() => null)).to.not.throw(Error);
     });
 
-    it('should throw when trigger is accessed', () => {
-      expect(() => storage.object().onArchive(() => null).__trigger).to.throw(
-        Error
-      );
-    });
-
-    it('should throw when endpoint is accessed', () => {
-      expect(() => storage.object().onArchive(() => null).__endpoint).to.throw(
-        Error
-      );
+    it("should throw when endpoint is accessed", () => {
+      expect(() => storage.object().onArchive(() => null).__endpoint).to.throw(Error);
     });
 
-    it('should not throw when #run is called', () => {
+    it("should not throw when #run is called", () => {
       const cf = storage.object().onArchive(() => null);
       expect(cf.run).to.not.throw(Error);
     });
diff --git a/spec/v1/providers/tasks.spec.ts b/spec/v1/providers/tasks.spec.ts
index 20f8c8e00..ec9e6d318 100644
--- a/spec/v1/providers/tasks.spec.ts
+++ b/spec/v1/providers/tasks.spec.ts
@@ -20,15 +20,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import * as functions from '../../../src';
-import { taskQueue } from '../../../src/providers/tasks';
-import { MockRequest } from '../../fixtures/mockrequest';
-import { runHandler } from '../../helper';
+import * as functions from "../../../src/v1";
+import { taskQueue } from "../../../src/v1/providers/tasks";
+import { MockRequest } from "../../fixtures/mockrequest";
+import { runHandler } from "../../helper";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
+import { MINIMIAL_TASK_QUEUE_TRIGGER } from "./fixtures";
 
-describe('#onDispatch', () => {
-  it('should return a trigger/endpoint with appropriate values', () => {
+describe("#onDispatch", () => {
+  it("should return a trigger/endpoint with appropriate values", () => {
     const result = taskQueue({
       rateLimits: {
         maxConcurrentDispatches: 30,
@@ -41,28 +43,12 @@ describe('#onDispatch', () => {
         maxDoublings: 3,
         minBackoffSeconds: 5,
       },
-      invoker: 'private',
-    }).onDispatch(() => {});
-
-    expect(result.__trigger).to.deep.equal({
-      taskQueueTrigger: {
-        rateLimits: {
-          maxConcurrentDispatches: 30,
-          maxDispatchesPerSecond: 40,
-        },
-        retryConfig: {
-          maxAttempts: 5,
-          maxRetrySeconds: 10,
-          maxBackoffSeconds: 20,
-          maxDoublings: 3,
-          minBackoffSeconds: 5,
-        },
-        invoker: ['private'],
-      },
-    });
+      invoker: "private",
+    }).onDispatch(() => undefined);
 
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
       taskQueueTrigger: {
         rateLimits: {
           maxConcurrentDispatches: 30,
@@ -75,38 +61,29 @@ describe('#onDispatch', () => {
           maxDoublings: 3,
           minBackoffSeconds: 5,
         },
-        invoker: ['private'],
+        invoker: ["private"],
       },
     });
   });
 
-  it('should allow both region and runtime options to be set', () => {
+  it("should allow both region and runtime options to be set", () => {
     const fn = functions
-      .region('us-east1')
+      .region("us-east1")
       .runWith({
         timeoutSeconds: 90,
-        memory: '256MB',
+        memory: "256MB",
       })
       .tasks.taskQueue({ retryConfig: { maxAttempts: 5 } })
       .onDispatch(() => null);
 
-    expect(fn.__trigger).to.deep.equal({
-      regions: ['us-east1'],
-      availableMemoryMb: 256,
-      timeout: '90s',
-      taskQueueTrigger: {
-        retryConfig: {
-          maxAttempts: 5,
-        },
-      },
-    });
-
     expect(fn.__endpoint).to.deep.equal({
-      platform: 'gcfv1',
-      region: ['us-east1'],
+      ...MINIMAL_V1_ENDPOINT,
+      platform: "gcfv1",
+      region: ["us-east1"],
       availableMemoryMb: 256,
       timeoutSeconds: 90,
       taskQueueTrigger: {
+        ...MINIMIAL_TASK_QUEUE_TRIGGER,
         retryConfig: {
           maxAttempts: 5,
         },
@@ -114,12 +91,12 @@ describe('#onDispatch', () => {
     });
   });
 
-  it('has a .run method', async () => {
-    const data = 'data';
+  it("has a .run method", async () => {
+    const data = "data";
     const context = {
       auth: {
-        uid: 'abc',
-        token: 'token' as any,
+        uid: "abc",
+        token: "token" as any,
       },
     };
     let done = false;
@@ -134,7 +111,7 @@ describe('#onDispatch', () => {
   });
 
   // Regression test for firebase-functions#947
-  it('should lock to the v1 API even with function.length == 1', async () => {
+  it("should lock to the v1 API even with function.length == 1", async () => {
     let gotData: Record<string, any>;
     const func = taskQueue().onDispatch((data) => {
       gotData = data;
@@ -142,25 +119,17 @@ describe('#onDispatch', () => {
 
     const req = new MockRequest(
       {
-        data: { foo: 'bar' },
+        data: { foo: "bar" },
       },
       {
-        'content-type': 'application/json',
-        authorization: 'Bearer abc',
+        "content-type": "application/json",
+        authorization: "Bearer abc",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const response = await runHandler(func, req as any);
     expect(response.status).to.equal(204);
-    expect(gotData).to.deep.equal({ foo: 'bar' });
-  });
-});
-
-describe('handler namespace', () => {
-  it('should return an empty trigger', () => {
-    const result = functions.handler.tasks.taskQueue.onDispatch(() => null);
-    expect(result.__trigger).to.deep.equal({});
-    expect(result.__endpoint).to.be.undefined;
+    expect(gotData).to.deep.equal({ foo: "bar" });
   });
 });
diff --git a/spec/v1/providers/testLab.spec.ts b/spec/v1/providers/testLab.spec.ts
index b3ba22d7f..6aaccad2e 100644
--- a/spec/v1/providers/testLab.spec.ts
+++ b/spec/v1/providers/testLab.spec.ts
@@ -20,38 +20,32 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import * as testLab from '../../../src/providers/testLab';
+import * as testLab from "../../../src/v1/providers/testLab";
+import { MINIMAL_V1_ENDPOINT } from "../../fixtures";
 
-describe('Test Lab Functions', () => {
-  describe('#onComplete', () => {
-    describe('with process.env.GCLOUD_PROJECT set', () => {
+describe("Test Lab Functions", () => {
+  describe("#onComplete", () => {
+    describe("with process.env.GCLOUD_PROJECT set", () => {
       before(() => {
-        process.env.GCLOUD_PROJECT = 'project1';
+        process.env.GCLOUD_PROJECT = "project1";
       });
 
       after(() => {
         delete process.env.GCLOUD_PROJECT;
       });
 
-      it('should return a trigger/endpoint with appropriate values', () => {
+      it("should return a trigger/endpoint with appropriate values", () => {
         const func = testLab.testMatrix().onComplete(() => null);
 
-        expect(func.__trigger).to.deep.equal({
-          eventTrigger: {
-            service: 'testing.googleapis.com',
-            eventType: 'google.testing.testMatrix.complete',
-            resource: 'projects/project1/testMatrices/{matrix}',
-          },
-        });
-
         expect(func.__endpoint).to.deep.equal({
-          platform: 'gcfv1',
+          ...MINIMAL_V1_ENDPOINT,
+          platform: "gcfv1",
           eventTrigger: {
-            eventType: 'google.testing.testMatrix.complete',
+            eventType: "google.testing.testMatrix.complete",
             eventFilters: {
-              resource: 'projects/project1/testMatrices/{matrix}',
+              resource: "projects/project1/testMatrices/{matrix}",
             },
             retry: false,
           },
@@ -63,174 +57,160 @@ describe('Test Lab Functions', () => {
         const event = {
           data: {
             clientInfo: {
-              name: 'test',
+              name: "test",
             },
-            invalidMatrixDetails: 'INVALID_INPUT_APK',
+            invalidMatrixDetails: "INVALID_INPUT_APK",
             resultStorage: {
               googleCloudStorage: {
-                gcsPath: 'gs://test.appspot.com',
+                gcsPath: "gs://test.appspot.com",
               },
             },
-            state: 'INVALID',
-            testMatrixId: 'matrix-375mfeu9mnw8t',
-            timestamp: '2019-04-15T17:43:32.538Z',
+            state: "INVALID",
+            testMatrixId: "matrix-375mfeu9mnw8t",
+            timestamp: "2019-04-15T17:43:32.538Z",
           },
           context: {
             resource: {},
           },
         };
         const expected = {
-          testMatrixId: 'matrix-375mfeu9mnw8t',
-          state: 'INVALID',
-          createTime: '2019-04-15T17:43:32.538Z',
+          testMatrixId: "matrix-375mfeu9mnw8t",
+          state: "INVALID",
+          createTime: "2019-04-15T17:43:32.538Z",
           outcomeSummary: undefined,
-          invalidMatrixDetails: 'INVALID_INPUT_APK',
+          invalidMatrixDetails: "INVALID_INPUT_APK",
           resultStorage: {
-            gcsPath: 'gs://test.appspot.com',
+            gcsPath: "gs://test.appspot.com",
             resultsUrl: undefined,
             toolResultsHistoryId: undefined,
             toolResultsExecutionId: undefined,
           } as testLab.ResultStorage,
           clientInfo: {
-            name: 'test',
+            name: "test",
             details: {},
           } as testLab.ClientInfo,
         } as testLab.TestMatrix;
         const func = testLab.testMatrix().onComplete((matrix) => matrix);
-        return expect(func(event.data, event.context)).to.eventually.deep.equal(
-          expected
-        );
+        return expect(func(event.data, event.context)).to.eventually.deep.equal(expected);
       });
 
       it('should parse TestMatrix in "FINISHED" state', () => {
         const event = {
           data: {
             clientInfo: {
-              name: 'test',
+              name: "test",
             },
-            outcomeSummary: 'FAILURE',
+            outcomeSummary: "FAILURE",
             resultStorage: {
               googleCloudStorage: {
-                gcsPath: 'gs://test.appspot.com',
+                gcsPath: "gs://test.appspot.com",
               },
               toolResultsExecution: {
-                executionId: '6352915701487950333',
-                historyId: 'bh.9b6f4dac24d3049',
-                projectId: 'test',
+                executionId: "6352915701487950333",
+                historyId: "bh.9b6f4dac24d3049",
+                projectId: "test",
               },
               toolResultsHistory: {
-                historyId: 'bh.9b6f4dac24d3049',
-                projectId: 'test',
+                historyId: "bh.9b6f4dac24d3049",
+                projectId: "test",
               },
-              resultsUrl: 'https://path/to/results',
+              resultsUrl: "https://path/to/results",
             },
-            state: 'FINISHED',
-            testMatrixId: 'matrix-tsgjk8pnvxhya',
-            timestamp: '2019-04-15T18:03:11.115Z',
+            state: "FINISHED",
+            testMatrixId: "matrix-tsgjk8pnvxhya",
+            timestamp: "2019-04-15T18:03:11.115Z",
           },
           context: {
             resource: {},
           },
         };
         const expected = {
-          testMatrixId: 'matrix-tsgjk8pnvxhya',
-          state: 'FINISHED',
-          createTime: '2019-04-15T18:03:11.115Z',
-          outcomeSummary: 'FAILURE',
+          testMatrixId: "matrix-tsgjk8pnvxhya",
+          state: "FINISHED",
+          createTime: "2019-04-15T18:03:11.115Z",
+          outcomeSummary: "FAILURE",
           invalidMatrixDetails: undefined,
           resultStorage: {
-            gcsPath: 'gs://test.appspot.com',
-            toolResultsHistoryId: 'bh.9b6f4dac24d3049',
-            toolResultsExecutionId: '6352915701487950333',
-            resultsUrl: 'https://path/to/results',
+            gcsPath: "gs://test.appspot.com",
+            toolResultsHistoryId: "bh.9b6f4dac24d3049",
+            toolResultsExecutionId: "6352915701487950333",
+            resultsUrl: "https://path/to/results",
           } as testLab.ResultStorage,
           clientInfo: {
-            name: 'test',
+            name: "test",
             details: {},
           } as testLab.ClientInfo,
         } as testLab.TestMatrix;
         const func = testLab.testMatrix().onComplete((matrix) => matrix);
-        return expect(func(event.data, event.context)).to.eventually.deep.equal(
-          expected
-        );
+        return expect(func(event.data, event.context)).to.eventually.deep.equal(expected);
       });
     });
 
-    describe('process.env.GCLOUD_PROJECT not set', () => {
-      it('should not throw if trigger is not accessed', () => {
-        expect(() => testLab.testMatrix().onComplete(() => null)).to.not.throw(
-          Error
-        );
-      });
-
-      it('should throw when trigger is accessed', () => {
-        expect(
-          () => testLab.testMatrix().onComplete(() => null).__trigger
-        ).to.throw(Error);
+    describe("process.env.GCLOUD_PROJECT not set", () => {
+      it("should not throw if __endpoint is not accessed", () => {
+        expect(() => testLab.testMatrix().onComplete(() => null)).to.not.throw(Error);
       });
 
-      it('should throw when endpoint is accessed', () => {
-        expect(
-          () => testLab.testMatrix().onComplete(() => null).__endpoint
-        ).to.throw(Error);
+      it("should throw when endpoint is accessed", () => {
+        expect(() => testLab.testMatrix().onComplete(() => null).__endpoint).to.throw(Error);
       });
     });
   });
 
-  describe('TestMatrix', () => {
-    describe('constructor', () => {
-      it('should populate basic fields', () => {
+  describe("TestMatrix", () => {
+    describe("constructor", () => {
+      it("should populate basic fields", () => {
         const expected = {
-          testMatrixId: 'id1',
-          createTime: '2019-02-08T18:50:32.178Z',
-          state: 'FINISHED',
-          outcomeSummary: 'SUCCESS',
-          invalidMatrixDetails: 'DETAILS_UNAVAILABLE',
+          testMatrixId: "id1",
+          createTime: "2019-02-08T18:50:32.178Z",
+          state: "FINISHED",
+          outcomeSummary: "SUCCESS",
+          invalidMatrixDetails: "DETAILS_UNAVAILABLE",
           resultStorage: new testLab.ResultStorage(),
           clientInfo: new testLab.ClientInfo(),
         } as testLab.TestMatrix;
         const actual = new testLab.TestMatrix({
-          testMatrixId: 'id1',
-          timestamp: '2019-02-08T18:50:32.178Z',
-          state: 'FINISHED',
-          outcomeSummary: 'SUCCESS',
-          invalidMatrixDetails: 'DETAILS_UNAVAILABLE',
+          testMatrixId: "id1",
+          timestamp: "2019-02-08T18:50:32.178Z",
+          state: "FINISHED",
+          outcomeSummary: "SUCCESS",
+          invalidMatrixDetails: "DETAILS_UNAVAILABLE",
         });
         expect(actual).to.deep.equal(expected);
       });
     });
   });
 
-  describe('ClientInfo', () => {
-    describe('constructor', () => {
-      it('should populate basic fields', () => {
+  describe("ClientInfo", () => {
+    describe("constructor", () => {
+      it("should populate basic fields", () => {
         const expected = {
-          name: 'client',
+          name: "client",
           details: {},
         } as testLab.ClientInfo;
         const actual = new testLab.ClientInfo({
-          name: 'client',
+          name: "client",
         });
         expect(actual).to.deep.equal(expected);
       });
 
-      it('should populate key/value details', () => {
+      it("should populate key/value details", () => {
         const expected = {
-          name: 'client',
+          name: "client",
           details: {
-            k0: 'v0',
-            k1: '',
+            k0: "v0",
+            k1: "",
           },
         } as testLab.ClientInfo;
         const actual = new testLab.ClientInfo({
-          name: 'client',
+          name: "client",
           clientInfoDetails: [
             {
-              key: 'k0',
-              value: 'v0',
+              key: "k0",
+              value: "v0",
             },
             {
-              key: 'k1',
+              key: "k1",
             },
           ],
         });
@@ -239,34 +219,34 @@ describe('Test Lab Functions', () => {
     });
   });
 
-  describe('ResultStorage', () => {
-    describe('constructor', () => {
-      it('should populate basic fields', () => {
+  describe("ResultStorage", () => {
+    describe("constructor", () => {
+      it("should populate basic fields", () => {
         const expected = {
-          gcsPath: 'path',
-          toolResultsHistoryId: 'h1',
-          toolResultsExecutionId: 'e2',
-          resultsUrl: 'http://example.com/',
+          gcsPath: "path",
+          toolResultsHistoryId: "h1",
+          toolResultsExecutionId: "e2",
+          resultsUrl: "http://example.com/",
         } as testLab.ResultStorage;
         const actual = new testLab.ResultStorage({
           googleCloudStorage: {
-            gcsPath: 'path',
+            gcsPath: "path",
           },
           toolResultsHistory: {
-            projectId: 'p1',
-            historyId: 'h1',
+            projectId: "p1",
+            historyId: "h1",
           },
           toolResultsExecution: {
-            projectId: 'p2',
-            historyId: 'h2',
-            executionId: 'e2',
+            projectId: "p2",
+            historyId: "h2",
+            executionId: "e2",
           },
-          resultsUrl: 'http://example.com/',
+          resultsUrl: "http://example.com/",
         });
         expect(actual).to.deep.equal(expected);
       });
 
-      it('should not throw on unset fields', () => {
+      it("should not throw on unset fields", () => {
         expect(() => new testLab.ResultStorage({})).to.not.throw();
       });
     });
diff --git a/spec/v1/utils.spec.ts b/spec/v1/utils.spec.ts
index db749ca5d..0f050ad35 100644
--- a/spec/v1/utils.spec.ts
+++ b/spec/v1/utils.spec.ts
@@ -20,21 +20,21 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { applyChange } from '../../src/utils';
+import { expect } from "chai";
+import { applyChange } from "../../src/common/utilities/utils";
 
-describe('utils', () => {
-  describe('.applyChange(from: any, to: any): any', () => {
-    it('should return the to value for non-object values of from and to', () => {
-      expect(applyChange({ a: 'b' }, null)).to.eq(null);
-      expect(applyChange(null, { a: 'b' })).to.deep.equal({ a: 'b' });
+describe("utils", () => {
+  describe(".applyChange(from: any, to: any): any", () => {
+    it("should return the to value for non-object values of from and to", () => {
+      expect(applyChange({ a: "b" }, null)).to.eq(null);
+      expect(applyChange(null, { a: "b" })).to.deep.equal({ a: "b" });
       expect(applyChange(23, null)).to.be.null;
     });
 
-    it('should return the merged value of two objects', () => {
-      const from = { a: { b: 'foo', c: 23, d: 444 }, d: { e: 42 } };
-      const to: any = { a: { b: 'bar', c: null }, d: null, e: { f: 'g' } };
-      const result = { a: { b: 'bar', d: 444 }, e: { f: 'g' } };
+    it("should return the merged value of two objects", () => {
+      const from = { a: { b: "foo", c: 23, d: 444 }, d: { e: 42 } };
+      const to: any = { a: { b: "bar", c: null }, d: null, e: { f: "g" } };
+      const result = { a: { b: "bar", d: 444 }, e: { f: "g" } };
       expect(applyChange(from, to)).to.deep.equal(result);
     });
   });
diff --git a/spec/v2/params.spec.ts b/spec/v2/params.spec.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/spec/v2/providers/alerts/alerts.spec.ts b/spec/v2/providers/alerts/alerts.spec.ts
index 3decbd111..4476e121e 100644
--- a/spec/v2/providers/alerts/alerts.spec.ts
+++ b/spec/v2/providers/alerts/alerts.spec.ts
@@ -1,11 +1,12 @@
-import { expect } from 'chai';
-import { CloudEvent } from '../../../../src/v2';
-import * as options from '../../../../src/v2/options';
-import * as alerts from '../../../../src/v2/providers/alerts';
-import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures';
+import { expect } from "chai";
+import { CloudEvent } from "../../../../src/v2";
+import * as options from "../../../../src/v2/options";
+import * as alerts from "../../../../src/v2/providers/alerts";
+import { FULL_OPTIONS } from "../fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../../fixtures";
 
-const ALERT_TYPE = 'new-alert-type';
-const APPID = '123456789';
+const ALERT_TYPE = "new-alert-type";
+const APPID = "123456789";
 
 const ALERT_EVENT_FILTER = {
   alerttype: ALERT_TYPE,
@@ -16,13 +17,14 @@ const ALERT_APP_EVENT_FILTER = {
   appid: APPID,
 };
 
-describe('alerts', () => {
-  describe('onAlertPublished', () => {
-    it('should create the function without opts', () => {
+describe("alerts", () => {
+  describe("onAlertPublished", () => {
+    it("should create the function without opts", () => {
       const result = alerts.onAlertPublished(ALERT_TYPE, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -32,7 +34,7 @@ describe('alerts', () => {
       });
     });
 
-    it('should create the function with opts', () => {
+    it("should create the function with opts", () => {
       const result = alerts.onAlertPublished(
         {
           ...FULL_OPTIONS,
@@ -44,6 +46,7 @@ describe('alerts', () => {
 
       expect(result.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: ALERT_APP_EVENT_FILTER,
@@ -52,18 +55,18 @@ describe('alerts', () => {
       });
     });
 
-    it('should have a .run method', () => {
+    it("should have a .run method", () => {
       const func = alerts.onAlertPublished(ALERT_TYPE, (event) => event);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 
-  describe('getEndpointAnnotation', () => {
+  describe("getEndpointAnnotation", () => {
     beforeEach(() => {
-      process.env.GCLOUD_PROJECT = 'aProject';
+      process.env.GCLOUD_PROJECT = "aProject";
     });
 
     afterEach(() => {
@@ -71,9 +74,10 @@ describe('alerts', () => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should define the endpoint without appId and opts', () => {
+    it("should define the endpoint without appId and opts", () => {
       expect(alerts.getEndpointAnnotation({}, ALERT_TYPE)).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -83,11 +87,10 @@ describe('alerts', () => {
       });
     });
 
-    it('should define a complex endpoint without appId', () => {
-      expect(
-        alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE)
-      ).to.deep.equal({
+    it("should define a complex endpoint without appId", () => {
+      expect(alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE)).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: ALERT_EVENT_FILTER,
@@ -96,11 +99,10 @@ describe('alerts', () => {
       });
     });
 
-    it('should define a complex endpoint', () => {
-      expect(
-        alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE, APPID)
-      ).to.deep.equal({
+    it("should define a complex endpoint", () => {
+      expect(alerts.getEndpointAnnotation({ ...FULL_OPTIONS }, ALERT_TYPE, APPID)).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: ALERT_APP_EVENT_FILTER,
@@ -109,24 +111,23 @@ describe('alerts', () => {
       });
     });
 
-    it('should merge global & specific opts', () => {
+    it("should merge global & specific opts", () => {
       options.setGlobalOptions({
         concurrency: 20,
-        region: 'europe-west1',
+        region: "europe-west1",
         minInstances: 1,
       });
       const specificOpts = {
-        region: 'us-west1',
+        region: "us-west1",
         minInstances: 3,
       };
 
-      expect(
-        alerts.getEndpointAnnotation(specificOpts, ALERT_TYPE, APPID)
-      ).to.deep.equal({
-        platform: 'gcfv2',
+      expect(alerts.getEndpointAnnotation(specificOpts, ALERT_TYPE, APPID)).to.deep.equal({
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         concurrency: 20,
-        region: ['us-west1'],
+        region: ["us-west1"],
         minInstances: 3,
         eventTrigger: {
           eventType: alerts.eventType,
@@ -137,56 +138,54 @@ describe('alerts', () => {
     });
   });
 
-  describe('getOptsAndAlertTypeAndApp', () => {
-    it('should parse a string', () => {
-      const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(
-        ALERT_TYPE
-      );
+  describe("getOptsAndAlertTypeAndApp", () => {
+    it("should parse a string", () => {
+      const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(ALERT_TYPE);
 
       expect(opts).to.deep.equal({});
       expect(alertType).to.equal(ALERT_TYPE);
       expect(appId).to.be.undefined;
     });
 
-    it('should parse an options object without appId', () => {
+    it("should parse an options object without appId", () => {
       const myOpts: alerts.FirebaseAlertOptions = {
         alertType: ALERT_TYPE,
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(alertType).to.equal(myOpts.alertType);
       expect(appId).to.be.undefined;
     });
 
-    it('should parse an options object with appId', () => {
+    it("should parse an options object with appId", () => {
       const myOpts: alerts.FirebaseAlertOptions = {
         alertType: ALERT_TYPE,
         appId: APPID,
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, alertType, appId] = alerts.getOptsAndAlertTypeAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(alertType).to.equal(myOpts.alertType);
       expect(appId).to.be.equal(myOpts.appId);
     });
   });
 
-  describe('convertAlertAndApp', () => {
+  describe("convertAlertAndApp", () => {
     const event: CloudEvent<string> = {
-      specversion: '1.0',
-      id: 'id',
-      source: 'source',
-      type: 'type',
-      time: 'now',
-      data: 'data',
+      specversion: "1.0",
+      id: "id",
+      source: "source",
+      type: "type",
+      time: "now",
+      data: "data",
     };
 
-    it('should leave event unchanged if alerttype & appid are missing', () => {
+    it("should leave event unchanged if alerttype & appid are missing", () => {
       const raw = { ...event };
 
       const converted = alerts.convertAlertAndApp(raw);
@@ -194,21 +193,21 @@ describe('alerts', () => {
       expect(raw).to.deep.eq(converted);
     });
 
-    it('should convert alerttype & appid when present', () => {
+    it("should convert alerttype & appid when present", () => {
       const raw = {
         ...event,
-        alerttype: 'my-alert',
-        appid: 'my-app',
+        alerttype: "my-alert",
+        appid: "my-app",
       };
 
       const converted = alerts.convertAlertAndApp(raw);
 
       expect(converted).to.deep.eq({
         ...event,
-        alerttype: 'my-alert',
-        appid: 'my-app',
-        alertType: 'my-alert',
-        appId: 'my-app',
+        alerttype: "my-alert",
+        appid: "my-app",
+        alertType: "my-alert",
+        appId: "my-app",
       });
     });
   });
diff --git a/spec/v2/providers/alerts/appDistribution.spec.ts b/spec/v2/providers/alerts/appDistribution.spec.ts
index 9b699bc62..7e2b7d0c6 100644
--- a/spec/v2/providers/alerts/appDistribution.spec.ts
+++ b/spec/v2/providers/alerts/appDistribution.spec.ts
@@ -1,25 +1,24 @@
-import { expect } from 'chai';
-import * as alerts from '../../../../src/v2/providers/alerts';
-import * as appDistribution from '../../../../src/v2/providers/alerts/appDistribution';
-import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures';
+import { expect } from "chai";
+import * as alerts from "../../../../src/v2/providers/alerts";
+import * as appDistribution from "../../../../src/v2/providers/alerts/appDistribution";
+import { FULL_OPTIONS } from "../fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../../fixtures";
 
-const APPID = '123456789';
+const APPID = "123456789";
 const myHandler = () => 42;
 
 const APP_EVENT_FILTER = {
   appid: APPID,
 };
 
-describe('appDistribution', () => {
-  describe('onNewTesterIosDevicePublished', () => {
-    it('should create a function with alertType & appId', () => {
-      const func = appDistribution.onNewTesterIosDevicePublished(
-        APPID,
-        myHandler
-      );
+describe("appDistribution", () => {
+  describe("onNewTesterIosDevicePublished", () => {
+    it("should create a function with alertType & appId", () => {
+      const func = appDistribution.onNewTesterIosDevicePublished(APPID, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -32,14 +31,12 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with opts', () => {
-      const func = appDistribution.onNewTesterIosDevicePublished(
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts", () => {
+      const func = appDistribution.onNewTesterIosDevicePublished({ ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -50,7 +47,7 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with appid in opts', () => {
+    it("should create a function with appid in opts", () => {
       const func = appDistribution.onNewTesterIosDevicePublished(
         { ...FULL_OPTIONS, appId: APPID },
         myHandler
@@ -58,6 +55,7 @@ describe('appDistribution', () => {
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -69,11 +67,12 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function without opts or appId', () => {
+    it("should create a function without opts or appId", () => {
       const func = appDistribution.onNewTesterIosDevicePublished(myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -85,24 +84,22 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with a run method', () => {
-      const func = appDistribution.onNewTesterIosDevicePublished(
-        APPID,
-        (event) => event
-      );
+    it("should create a function with a run method", () => {
+      const func = appDistribution.onNewTesterIosDevicePublished(APPID, (event) => event);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 
-  describe('onInAppfeedbackPublished', () => {
-    it('should create a function with alertType & appId', () => {
+  describe("onInAppfeedbackPublished", () => {
+    it("should create a function with alertType & appId", () => {
       const func = appDistribution.onInAppFeedbackPublished(APPID, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -115,14 +112,12 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with opts', () => {
-      const func = appDistribution.onInAppFeedbackPublished(
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts", () => {
+      const func = appDistribution.onInAppFeedbackPublished({ ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -133,7 +128,7 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with appid in opts', () => {
+    it("should create a function with appid in opts", () => {
       const func = appDistribution.onInAppFeedbackPublished(
         { ...FULL_OPTIONS, appId: APPID },
         myHandler
@@ -141,6 +136,7 @@ describe('appDistribution', () => {
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -152,11 +148,12 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function without opts or appId', () => {
+    it("should create a function without opts or appId", () => {
       const func = appDistribution.onInAppFeedbackPublished(myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -168,46 +165,43 @@ describe('appDistribution', () => {
       });
     });
 
-    it('should create a function with a run method', () => {
-      const func = appDistribution.onInAppFeedbackPublished(
-        APPID,
-        (event) => event
-      );
+    it("should create a function with a run method", () => {
+      const func = appDistribution.onInAppFeedbackPublished(APPID, (event) => event);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 
-  describe('getOptsAndApp', () => {
-    it('should parse a string', () => {
+  describe("getOptsAndApp", () => {
+    it("should parse a string", () => {
       const [opts, appId] = appDistribution.getOptsAndApp(APPID);
 
       expect(opts).to.deep.equal({});
       expect(appId).to.equal(APPID);
     });
 
-    it('should parse an options object without appId', () => {
+    it("should parse an options object without appId", () => {
       const myOpts: appDistribution.AppDistributionOptions = {
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, appId] = appDistribution.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.be.undefined;
     });
 
-    it('should parse an options object with appId', () => {
+    it("should parse an options object with appId", () => {
       const myOpts: appDistribution.AppDistributionOptions = {
         appId: APPID,
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, appId] = appDistribution.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.equal(APPID);
     });
   });
diff --git a/spec/v2/providers/alerts/billing.spec.ts b/spec/v2/providers/alerts/billing.spec.ts
index 4bf5f3080..d4be3403d 100644
--- a/spec/v2/providers/alerts/billing.spec.ts
+++ b/spec/v2/providers/alerts/billing.spec.ts
@@ -1,18 +1,20 @@
-import { expect } from 'chai';
-import * as alerts from '../../../../src/v2/providers/alerts';
-import * as billing from '../../../../src/v2/providers/alerts/billing';
-import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures';
+import { expect } from "chai";
+import * as alerts from "../../../../src/v2/providers/alerts";
+import * as billing from "../../../../src/v2/providers/alerts/billing";
+import { FULL_OPTIONS } from "../fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../../fixtures";
 
-const ALERT_TYPE = 'new-alert-type';
+const ALERT_TYPE = "new-alert-type";
 const myHandler = () => 42;
 
-describe('billing', () => {
-  describe('onPlanUpdatePublished', () => {
-    it('should create a function with only handler', () => {
+describe("billing", () => {
+  describe("onPlanUpdatePublished", () => {
+    it("should create a function with only handler", () => {
       const func = billing.onPlanUpdatePublished(myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -24,14 +26,12 @@ describe('billing', () => {
       });
     });
 
-    it('should create a function with opts & handler', () => {
-      const func = billing.onPlanUpdatePublished(
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts & handler", () => {
+      const func = billing.onPlanUpdatePublished({ ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -43,12 +43,13 @@ describe('billing', () => {
     });
   });
 
-  describe('onPlanAutomatedUpdatePublished', () => {
-    it('should create a function with only handler', () => {
+  describe("onPlanAutomatedUpdatePublished", () => {
+    it("should create a function with only handler", () => {
       const func = billing.onPlanAutomatedUpdatePublished(myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -60,14 +61,12 @@ describe('billing', () => {
       });
     });
 
-    it('should create a function with opts & handler', () => {
-      const func = billing.onPlanAutomatedUpdatePublished(
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts & handler", () => {
+      const func = billing.onPlanAutomatedUpdatePublished({ ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -79,12 +78,13 @@ describe('billing', () => {
     });
   });
 
-  describe('onOperation', () => {
-    it('should create a function with alertType only', () => {
+  describe("onOperation", () => {
+    it("should create a function with alertType only", () => {
       const func = billing.onOperation(ALERT_TYPE, myHandler, undefined);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -96,15 +96,12 @@ describe('billing', () => {
       });
     });
 
-    it('should create a function with opts', () => {
-      const func = billing.onOperation(
-        ALERT_TYPE,
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts", () => {
+      const func = billing.onOperation(ALERT_TYPE, { ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -115,12 +112,12 @@ describe('billing', () => {
       });
     });
 
-    it('should create a function with a run method', () => {
+    it("should create a function with a run method", () => {
       const func = billing.onOperation(ALERT_TYPE, (event) => event, undefined);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 });
diff --git a/spec/v2/providers/alerts/crashlytics.spec.ts b/spec/v2/providers/alerts/crashlytics.spec.ts
index 08956d8c7..fd4984b76 100644
--- a/spec/v2/providers/alerts/crashlytics.spec.ts
+++ b/spec/v2/providers/alerts/crashlytics.spec.ts
@@ -1,36 +1,37 @@
-import { expect } from 'chai';
-import * as alerts from '../../../../src/v2/providers/alerts';
-import * as crashlytics from '../../../../src/v2/providers/alerts/crashlytics';
-import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures';
-
-const ALERT_TYPE = 'new-alert-type';
-const APPID = '123456789';
+import { expect } from "chai";
+import * as alerts from "../../../../src/v2/providers/alerts";
+import * as crashlytics from "../../../../src/v2/providers/alerts/crashlytics";
+import { FULL_OPTIONS } from "../fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../../fixtures";
+
+const ALERT_TYPE = "new-alert-type";
+const APPID = "123456789";
 const myHandler = () => 42;
 
-describe('crashlytics', () => {
+describe("crashlytics", () => {
   const testcases = [
     {
-      method: 'onNewFatalIssuePublished',
+      method: "onNewFatalIssuePublished",
       event: crashlytics.newFatalIssueAlert,
     },
     {
-      method: 'onNewNonfatalIssuePublished',
+      method: "onNewNonfatalIssuePublished",
       event: crashlytics.newNonfatalIssueAlert,
     },
     {
-      method: 'onRegressionAlertPublished',
+      method: "onRegressionAlertPublished",
       event: crashlytics.regressionAlert,
     },
     {
-      method: 'onStabilityDigestPublished',
+      method: "onStabilityDigestPublished",
       event: crashlytics.stabilityDigestAlert,
     },
     {
-      method: 'onVelocityAlertPublished',
+      method: "onVelocityAlertPublished",
       event: crashlytics.velocityAlert,
     },
     {
-      method: 'onNewAnrIssuePublished',
+      method: "onNewAnrIssuePublished",
       event: crashlytics.newAnrIssueAlert,
     },
   ];
@@ -46,11 +47,12 @@ describe('crashlytics', () => {
     };
 
     describe(method, () => {
-      it('should create a function only handler', () => {
+      it("should create a function only handler", () => {
         const func = crashlytics[method](myHandler);
 
         expect(func.__endpoint).to.deep.equal({
-          platform: 'gcfv2',
+          ...MINIMAL_V2_ENDPOINT,
+          platform: "gcfv2",
           labels: {},
           eventTrigger: {
             eventType: alerts.eventType,
@@ -60,11 +62,12 @@ describe('crashlytics', () => {
         });
       });
 
-      it('should create a function with appId', () => {
+      it("should create a function with appId", () => {
         const func = crashlytics[method](APPID, myHandler);
 
         expect(func.__endpoint).to.deep.equal({
-          platform: 'gcfv2',
+          ...MINIMAL_V2_ENDPOINT,
+          platform: "gcfv2",
           labels: {},
           eventTrigger: {
             eventType: alerts.eventType,
@@ -74,11 +77,12 @@ describe('crashlytics', () => {
         });
       });
 
-      it('should create a function with base opts', () => {
+      it("should create a function with base opts", () => {
         const func = crashlytics[method]({ ...FULL_OPTIONS }, myHandler);
 
         expect(func.__endpoint).to.deep.equal({
           ...FULL_ENDPOINT,
+          platform: "gcfv2",
           eventTrigger: {
             eventType: alerts.eventType,
             eventFilters: ALERT_EVENT_FILTER,
@@ -87,14 +91,12 @@ describe('crashlytics', () => {
         });
       });
 
-      it('should create a function with opts', () => {
-        const func = crashlytics[method](
-          { ...FULL_OPTIONS, appId: APPID },
-          myHandler
-        );
+      it("should create a function with opts", () => {
+        const func = crashlytics[method]({ ...FULL_OPTIONS, appId: APPID }, myHandler);
 
         expect(func.__endpoint).to.deep.equal({
           ...FULL_ENDPOINT,
+          platform: "gcfv2",
           eventTrigger: {
             eventType: alerts.eventType,
             eventFilters: ALERT_APP_EVENT_FILTER,
@@ -114,12 +116,13 @@ describe('crashlytics', () => {
     appid: APPID,
   };
 
-  describe('onOperation', () => {
-    it('should create a function with alertType only', () => {
+  describe("onOperation", () => {
+    it("should create a function with alertType only", () => {
       const func = crashlytics.onOperation(ALERT_TYPE, myHandler, undefined);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -129,11 +132,12 @@ describe('crashlytics', () => {
       });
     });
 
-    it('should create a function with alertType & appId', () => {
+    it("should create a function with alertType & appId", () => {
       const func = crashlytics.onOperation(ALERT_TYPE, APPID, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -143,15 +147,12 @@ describe('crashlytics', () => {
       });
     });
 
-    it('should create a function with base opts', () => {
-      const func = crashlytics.onOperation(
-        ALERT_TYPE,
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with base opts", () => {
+      const func = crashlytics.onOperation(ALERT_TYPE, { ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: ALERT_EVENT_FILTER,
@@ -160,7 +161,7 @@ describe('crashlytics', () => {
       });
     });
 
-    it('should create a function with appid in opts', () => {
+    it("should create a function with appid in opts", () => {
       const func = crashlytics.onOperation(
         ALERT_TYPE,
         { ...FULL_OPTIONS, appId: APPID },
@@ -169,6 +170,7 @@ describe('crashlytics', () => {
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: ALERT_APP_EVENT_FILTER,
@@ -177,22 +179,18 @@ describe('crashlytics', () => {
       });
     });
 
-    it('should create a function with a run method', () => {
-      const func = crashlytics.onOperation(
-        ALERT_TYPE,
-        (event) => event,
-        undefined
-      );
+    it("should create a function with a run method", () => {
+      const func = crashlytics.onOperation(ALERT_TYPE, (event) => event, undefined);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 
-  describe('getOptsAndApp', () => {
-    it('should parse a string', () => {
-      const APPID = '123456789';
+  describe("getOptsAndApp", () => {
+    it("should parse a string", () => {
+      const APPID = "123456789";
 
       const [opts, appId] = crashlytics.getOptsAndApp(APPID);
 
@@ -200,26 +198,26 @@ describe('crashlytics', () => {
       expect(appId).to.equal(APPID);
     });
 
-    it('should parse an options object without appId', () => {
+    it("should parse an options object without appId", () => {
       const myOpts: crashlytics.CrashlyticsOptions = {
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, appId] = crashlytics.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.be.undefined;
     });
 
-    it('should parse an options object with appId', () => {
+    it("should parse an options object with appId", () => {
       const myOpts: crashlytics.CrashlyticsOptions = {
-        appId: '123456789',
-        region: 'us-west1',
+        appId: "123456789",
+        region: "us-west1",
       };
 
       const [opts, appId] = crashlytics.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.equal(myOpts.appId);
     });
   });
diff --git a/spec/v2/providers/alerts/performance.spec.ts b/spec/v2/providers/alerts/performance.spec.ts
index 99f99ddc7..667aa7ba5 100644
--- a/spec/v2/providers/alerts/performance.spec.ts
+++ b/spec/v2/providers/alerts/performance.spec.ts
@@ -1,22 +1,24 @@
-import { expect } from 'chai';
-import * as alerts from '../../../../src/v2/providers/alerts';
-import * as performance from '../../../../src/v2/providers/alerts/performance';
-import { FULL_ENDPOINT, FULL_OPTIONS } from '../fixtures';
+import { expect } from "chai";
+import * as alerts from "../../../../src/v2/providers/alerts";
+import * as performance from "../../../../src/v2/providers/alerts/performance";
+import { FULL_OPTIONS } from "../fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../../fixtures";
 
-const APPID = '123456789';
+const APPID = "123456789";
 const myHandler = () => 42;
 
 const APP_EVENT_FILTER = {
   appid: APPID,
 };
 
-describe('performance', () => {
-  describe('onThresholdAlertPublished', () => {
-    it('should create a function with alertType & appId', () => {
+describe("performance", () => {
+  describe("onThresholdAlertPublished", () => {
+    it("should create a function with alertType & appId", () => {
       const func = performance.onThresholdAlertPublished(APPID, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -29,14 +31,12 @@ describe('performance', () => {
       });
     });
 
-    it('should create a function with opts', () => {
-      const func = performance.onThresholdAlertPublished(
-        { ...FULL_OPTIONS },
-        myHandler
-      );
+    it("should create a function with opts", () => {
+      const func = performance.onThresholdAlertPublished({ ...FULL_OPTIONS }, myHandler);
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -47,7 +47,7 @@ describe('performance', () => {
       });
     });
 
-    it('should create a function with appid in opts', () => {
+    it("should create a function with appid in opts", () => {
       const func = performance.onThresholdAlertPublished(
         { ...FULL_OPTIONS, appId: APPID },
         myHandler
@@ -55,6 +55,7 @@ describe('performance', () => {
 
       expect(func.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           eventType: alerts.eventType,
           eventFilters: {
@@ -66,11 +67,12 @@ describe('performance', () => {
       });
     });
 
-    it('should create a function without opts or appId', () => {
+    it("should create a function without opts or appId", () => {
       const func = performance.onThresholdAlertPublished(myHandler);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: alerts.eventType,
@@ -82,56 +84,53 @@ describe('performance', () => {
       });
     });
 
-    it('should create a function with a run method', () => {
-      const func = performance.onThresholdAlertPublished(
-        APPID,
-        (event) => event
-      );
+    it("should create a function with a run method", () => {
+      const func = performance.onThresholdAlertPublished(APPID, (event) => event);
 
-      const res = func.run('input' as any);
+      const res = func.run("input" as any);
 
-      expect(res).to.equal('input');
+      expect(res).to.equal("input");
     });
   });
 
-  describe('getOptsAndApp', () => {
-    it('should parse a string', () => {
+  describe("getOptsAndApp", () => {
+    it("should parse a string", () => {
       const [opts, appId] = performance.getOptsAndApp(APPID);
 
       expect(opts).to.deep.equal({});
       expect(appId).to.equal(APPID);
     });
 
-    it('should parse an options object without appId', () => {
+    it("should parse an options object without appId", () => {
       const myOpts: performance.PerformanceOptions = {
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, appId] = performance.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.be.undefined;
     });
 
-    it('should parse an options object with appId', () => {
+    it("should parse an options object with appId", () => {
       const myOpts: performance.PerformanceOptions = {
         appId: APPID,
-        region: 'us-west1',
+        region: "us-west1",
       };
 
       const [opts, appId] = performance.getOptsAndApp(myOpts);
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
+      expect(opts).to.deep.equal({ region: "us-west1" });
       expect(appId).to.equal(APPID);
     });
   });
 
-  describe('convertPayload', () => {
-    it('should return the same payload', () => {
+  describe("convertPayload", () => {
+    it("should return the same payload", () => {
       const payload = {
-        a: 'b',
+        a: "b",
         conditionPercentile: 23,
-        appVersion: '3',
+        appVersion: "3",
       };
 
       const convertedPayload = performance.convertPayload(payload as any);
@@ -139,29 +138,29 @@ describe('performance', () => {
       expect(convertedPayload).to.deep.eq(payload);
     });
 
-    it('should return the same payload if the fields are undefined', () => {
+    it("should return the same payload if the fields are undefined", () => {
       const payload = {
-        a: 'b',
+        a: "b",
       };
 
       const convertedPayload = performance.convertPayload(payload as any);
 
       expect(convertedPayload).to.deep.eq({
-        a: 'b',
+        a: "b",
       });
     });
 
-    it('should remove fields', () => {
+    it("should remove fields", () => {
       const payload = {
-        a: 'b',
+        a: "b",
         conditionPercentile: 0,
-        appVersion: '',
+        appVersion: "",
       };
 
       const convertedPayload = performance.convertPayload(payload as any);
 
       expect(convertedPayload).to.deep.eq({
-        a: 'b',
+        a: "b",
       });
     });
   });
diff --git a/spec/v2/providers/database.spec.ts b/spec/v2/providers/database.spec.ts
index f700c58d3..acd87644d 100644
--- a/spec/v2/providers/database.spec.ts
+++ b/spec/v2/providers/database.spec.ts
@@ -20,186 +20,187 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { PathPattern } from '../../../src/utilities/path-pattern';
-import * as database from '../../../src/v2/providers/database';
+import { expect } from "chai";
+import { PathPattern } from "../../../src/common/utilities/path-pattern";
+import * as database from "../../../src/v2/providers/database";
+import { expectType } from "../../common/metaprogramming";
+import { MINIMAL_V2_ENDPOINT } from "../../fixtures";
 
 const RAW_RTDB_EVENT: database.RawRTDBCloudEvent = {
   data: {
-    ['@type']:
-      'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData',
+    ["@type"]: "type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData",
     data: {},
     delta: {},
   },
-  firebasedatabasehost: 'firebaseio.com',
-  instance: 'my-instance',
-  ref: 'foo/bar',
-  location: 'us-central1',
-  id: 'id',
-  source: 'source',
-  specversion: '1.0',
-  time: 'time',
-  type: 'type',
+  firebasedatabasehost: "firebaseio.com",
+  instance: "my-instance",
+  ref: "foo/bar",
+  location: "us-central1",
+  id: "id",
+  source: "source",
+  specversion: "1.0",
+  time: "time",
+  type: "type",
 };
 
-describe('database', () => {
-  describe('makeParams', () => {
-    it('should make params with basic path', () => {
+describe("database", () => {
+  describe("makeParams", () => {
+    it("should make params with basic path", () => {
       const event: database.RawRTDBCloudEvent = {
         ...RAW_RTDB_EVENT,
-        ref: 'match_a/something/else/nothing/end/match_b',
+        ref: "match_a/something/else/nothing/end/match_b",
       };
 
       expect(
         database.makeParams(
           event,
-          new PathPattern('{a}/something/else/*/end/{b}'),
-          new PathPattern('*')
+          new PathPattern("{a}/something/else/*/end/{b}"),
+          new PathPattern("*")
         )
       ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
+        a: "match_a",
+        b: "match_b",
       });
     });
 
-    it('should make params with multi segment path', () => {
+    it("should make params with multi segment path", () => {
       const event: database.RawRTDBCloudEvent = {
         ...RAW_RTDB_EVENT,
-        ref: 'something/is/a/thing/else/match_a/hello/match_b/world',
+        ref: "something/is/a/thing/else/match_a/hello/match_b/world",
       };
 
       expect(
         database.makeParams(
           event,
-          new PathPattern('something/**/else/{a}/hello/{b}/world'),
-          new PathPattern('*')
+          new PathPattern("something/**/else/{a}/hello/{b}/world"),
+          new PathPattern("*")
         )
       ).to.deep.equal({
-        a: 'match_a',
-        b: 'match_b',
+        a: "match_a",
+        b: "match_b",
       });
     });
 
-    it('should make params with multi segment path capture', () => {
+    it("should make params with multi segment path capture", () => {
       const event: database.RawRTDBCloudEvent = {
         ...RAW_RTDB_EVENT,
-        ref: 'something/is/a/thing/else/match_a/hello/match_b/world',
+        ref: "something/is/a/thing/else/match_a/hello/match_b/world",
       };
 
       expect(
         database.makeParams(
           event,
-          new PathPattern('something/{path=**}/else/{a}/hello/{b}/world'),
-          new PathPattern('*')
+          new PathPattern("something/{path=**}/else/{a}/hello/{b}/world"),
+          new PathPattern("*")
         )
       ).to.deep.equal({
-        path: 'is/a/thing',
-        a: 'match_a',
-        b: 'match_b',
+        path: "is/a/thing",
+        a: "match_a",
+        b: "match_b",
       });
     });
 
-    it('should make params for a full path and instance', () => {
+    it("should make params for a full path and instance", () => {
       const event: database.RawRTDBCloudEvent = {
         ...RAW_RTDB_EVENT,
-        ref: 'something/is/a/thing/else/match_a/hello/match_b/world',
+        ref: "something/is/a/thing/else/match_a/hello/match_b/world",
       };
 
       expect(
         database.makeParams(
           event,
-          new PathPattern('something/{path=**}/else/{a}/hello/{b}/world'),
-          new PathPattern('{inst}')
+          new PathPattern("something/{path=**}/else/{a}/hello/{b}/world"),
+          new PathPattern("*")
         )
       ).to.deep.equal({
-        path: 'is/a/thing',
-        a: 'match_a',
-        b: 'match_b',
-        inst: 'my-instance',
+        path: "is/a/thing",
+        a: "match_a",
+        b: "match_b",
       });
     });
   });
 
-  describe('getOpts', () => {
-    it('should return opts when passed in a path', () => {
-      expect(database.getOpts('/foo/{bar}/')).to.deep.equal({
-        path: 'foo/{bar}',
-        instance: '*',
+  describe("getOpts", () => {
+    it("should return opts when passed in a path", () => {
+      expect(database.getOpts("/foo/{bar}/")).to.deep.equal({
+        path: "foo/{bar}",
+        instance: "*",
         opts: {},
       });
     });
 
-    it('should return opts when passed in an options object', () => {
+    it("should return opts when passed in an options object", () => {
       expect(
         database.getOpts({
-          ref: '/foo/{bar}/',
-          instance: '{inst}',
-          region: 'us-central1',
+          ref: "/foo/{bar}/",
+          region: "us-central1",
         })
       ).to.deep.equal({
-        path: 'foo/{bar}',
-        instance: '{inst}',
+        path: "foo/{bar}",
+        instance: "*",
         opts: {
-          region: 'us-central1',
+          region: "us-central1",
         },
       });
     });
   });
 
-  describe('makeEndpoint', () => {
-    it('should create an endpoint with an instance wildcard', () => {
+  describe("makeEndpoint", () => {
+    it("should create an endpoint with an instance wildcard", () => {
       const ep = database.makeEndpoint(
         database.writtenEventType,
         {
-          region: 'us-central1',
-          labels: { 1: '2' },
+          region: "us-central1",
+          labels: { 1: "2" },
         },
-        new PathPattern('foo/bar'),
-        new PathPattern('{inst}')
+        new PathPattern("foo/bar"),
+        new PathPattern("*")
       );
 
       expect(ep).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {
-          1: '2',
+          1: "2",
         },
-        region: ['us-central1'],
+        region: ["us-central1"],
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/bar',
-            instance: '{inst}',
+            ref: "foo/bar",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create an endpoint without an instance wildcard', () => {
+    it("should create an endpoint without an instance wildcard", () => {
       const ep = database.makeEndpoint(
         database.writtenEventType,
         {
-          region: 'us-central1',
-          labels: { 1: '2' },
+          region: "us-central1",
+          labels: { 1: "2" },
         },
-        new PathPattern('foo/bar'),
-        new PathPattern('my-instance')
+        new PathPattern("foo/bar"),
+        new PathPattern("my-instance")
       );
 
       expect(ep).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {
-          1: '2',
+          1: "2",
         },
-        region: ['us-central1'],
+        region: ["us-central1"],
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/bar',
+            ref: "foo/bar",
           },
           retry: false,
         },
@@ -207,77 +208,72 @@ describe('database', () => {
     });
   });
 
-  describe('onChangedOperation', () => {
-    it('should create a function for a written event', () => {
-      const func = database.onChangedOperation(
-        database.writtenEventType,
-        '/foo/{bar}/',
-        (event) => 2
-      );
+  describe("onChangedOperation", () => {
+    it("should create a function for a written event", () => {
+      const func = database.onChangedOperation(database.writtenEventType, "/foo/{bar}/", () => 2);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function for a updated event', () => {
-      const func = database.onChangedOperation(
-        database.updatedEventType,
-        '/foo/{bar}/',
-        (event) => 2
-      );
+    it("should create a function for a updated event", () => {
+      const func = database.onChangedOperation(database.updatedEventType, "/foo/{bar}/", () => 2);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.updatedEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a complex function', () => {
+    it("should create a complex function", () => {
       const func = database.onChangedOperation(
         database.writtenEventType,
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        () => 2
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
@@ -285,77 +281,72 @@ describe('database', () => {
     });
   });
 
-  describe('onOperation', () => {
-    it('should create a function for a created event', () => {
-      const func = database.onOperation(
-        database.createdEventType,
-        '/foo/{bar}/',
-        (event) => 2
-      );
+  describe("onOperation", () => {
+    it("should create a function for a created event", () => {
+      const func = database.onOperation(database.createdEventType, "/foo/{bar}/", () => 2);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.createdEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function for a deleted event', () => {
-      const func = database.onOperation(
-        database.deletedEventType,
-        '/foo/{bar}/',
-        (event) => 2
-      );
+    it("should create a function for a deleted event", () => {
+      const func = database.onOperation(database.deletedEventType, "/foo/{bar}/", () => 2);
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.deletedEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a complex function', () => {
+    it("should create a complex function", () => {
       const func = database.onOperation(
         database.createdEventType,
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        () => 2
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.createdEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
@@ -363,50 +354,56 @@ describe('database', () => {
     });
   });
 
-  describe('onValueWritten', () => {
-    it('should create a function with a reference', () => {
-      const func = database.onValueWritten('/foo/{bar}/', (event) => 2);
+  describe("onValueWritten", () => {
+    it("should create a function with a reference", () => {
+      const func = database.onValueWritten("/foo/{bar}/", (event) => {
+        expectType<{ bar: string }>(event.params);
+      });
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function with opts', () => {
+    it("should create a function with opts", () => {
       const func = database.onValueWritten(
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        (event) => {
+          expectType<{ path: string; bar: string }>(event.params);
+        }
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.writtenEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
@@ -414,50 +411,59 @@ describe('database', () => {
     });
   });
 
-  describe('onValueCreated', () => {
-    it('should create a function with a reference', () => {
-      const func = database.onValueCreated('/foo/{bar}/', (event) => 2);
+  describe("onValueCreated", () => {
+    it("should create a function with a reference", () => {
+      const func = database.onValueCreated("/foo/{bar}/", (event) => {
+        expectType<{ bar: string }>(event.params);
+      });
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.createdEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function with opts', () => {
+    it("should create a function with opts", () => {
       const func = database.onValueCreated(
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        (event) => {
+          expectType<{
+            path: string;
+            bar: string;
+          }>(event.params);
+        }
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.createdEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
@@ -465,50 +471,56 @@ describe('database', () => {
     });
   });
 
-  describe('onValueUpdated', () => {
-    it('should create a function with a reference', () => {
-      const func = database.onValueUpdated('/foo/{bar}/', (event) => 2);
+  describe("onValueUpdated", () => {
+    it("should create a function with a reference", () => {
+      const func = database.onValueUpdated("/foo/{bar}/", (event) => {
+        expectType<{ bar: string }>(event.params);
+      });
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.updatedEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function with opts', () => {
+    it("should create a function with opts", () => {
       const func = database.onValueUpdated(
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        (event) => {
+          expectType<{ path: string; bar: string }>(event.params);
+        }
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.updatedEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
@@ -516,50 +528,56 @@ describe('database', () => {
     });
   });
 
-  describe('onValueDeleted', () => {
-    it('should create a function with a reference', () => {
-      const func = database.onValueDeleted('/foo/{bar}/', (event) => 2);
+  describe("onValueDeleted", () => {
+    it("should create a function with a reference", () => {
+      const func = database.onValueDeleted("/foo/{bar}/", (event) => {
+        expectType<{ bar: string }>(event.params);
+      });
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           eventType: database.deletedEventType,
           eventFilters: {},
           eventFilterPathPatterns: {
-            ref: 'foo/{bar}',
-            instance: '*',
+            ref: "foo/{bar}",
+            instance: "*",
           },
           retry: false,
         },
       });
     });
 
-    it('should create a function with opts', () => {
+    it("should create a function with opts", () => {
       const func = database.onValueDeleted(
         {
-          ref: '/foo/{path=**}/{bar}/',
-          instance: 'my-instance',
-          region: 'us-central1',
-          cpu: 'gcf_gen1',
+          ref: "/foo/{path=**}/{bar}/",
+          instance: "my-instance",
+          region: "us-central1",
+          cpu: "gcf_gen1",
           minInstances: 2,
         },
-        (event) => 2
+        (event) => {
+          expectType<{ path: string; bar: string }>(event.params);
+        }
       );
 
       expect(func.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
-        cpu: 'gcf_gen1',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        cpu: "gcf_gen1",
         minInstances: 2,
-        region: ['us-central1'],
+        region: ["us-central1"],
         labels: {},
         eventTrigger: {
           eventType: database.deletedEventType,
           eventFilters: {
-            instance: 'my-instance',
+            instance: "my-instance",
           },
           eventFilterPathPatterns: {
-            ref: 'foo/{path=**}/{bar}',
+            ref: "foo/{path=**}/{bar}",
           },
           retry: false,
         },
diff --git a/spec/v2/providers/eventarc.spec.ts b/spec/v2/providers/eventarc.spec.ts
index 96bd48940..feb42b458 100644
--- a/spec/v2/providers/eventarc.spec.ts
+++ b/spec/v2/providers/eventarc.spec.ts
@@ -20,21 +20,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as options from '../../../src/v2/options';
-import * as eventarc from '../../../src/v2/providers/eventarc';
-import { FULL_ENDPOINT, FULL_OPTIONS } from './fixtures';
+import { expect } from "chai";
+import * as options from "../../../src/v2/options";
+import * as eventarc from "../../../src/v2/providers/eventarc";
+import { FULL_OPTIONS } from "./fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
 
 const ENDPOINT_EVENT_TRIGGER = {
-  eventType: 'event-type',
+  eventType: "event-type",
   retry: false,
   eventFilters: {},
 };
 
-describe('v2/eventarc', () => {
-  describe('onCustomEventPublished', () => {
+describe("v2/eventarc", () => {
+  describe("onCustomEventPublished", () => {
     beforeEach(() => {
-      process.env.GCLOUD_PROJECT = 'aProject';
+      process.env.GCLOUD_PROJECT = "aProject";
     });
 
     afterEach(() => {
@@ -42,104 +43,109 @@ describe('v2/eventarc', () => {
       delete process.env.GCLOUD_PROJECT;
     });
 
-    it('should create a minimal trigger/endpoint with default channel', () => {
-      const result = eventarc.onCustomEventPublished('event-type', () => 42);
+    it("should create a minimal trigger/endpoint with default channel", () => {
+      const result = eventarc.onCustomEventPublished("event-type", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
-          channel: 'locations/us-central1/channels/firebase',
+          channel: "locations/us-central1/channels/firebase",
         },
       });
     });
 
-    it('should create a minimal trigger/endpoint with opts', () => {
+    it("should create a minimal trigger/endpoint with opts", () => {
       const result = eventarc.onCustomEventPublished(
-        { eventType: 'event-type', region: 'us-west1' },
+        { eventType: "event-type", region: "us-west1" },
         () => 42
       );
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
-          channel: 'locations/us-central1/channels/firebase',
+          channel: "locations/us-central1/channels/firebase",
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should create a minimal trigger with channel with opts', () => {
+    it("should create a minimal trigger with channel with opts", () => {
       const result = eventarc.onCustomEventPublished(
         {
-          eventType: 'event-type',
-          channel: 'locations/us-west1/channels/my-channel',
-          filters: { foo: 'bar' },
+          eventType: "event-type",
+          channel: "locations/us-west1/channels/my-channel",
+          filters: { foo: "bar" },
         },
         () => 42
       );
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
-          channel: 'locations/us-west1/channels/my-channel',
+          channel: "locations/us-west1/channels/my-channel",
           eventFilters: {
-            foo: 'bar',
+            foo: "bar",
           },
         },
       });
     });
 
-    it('should create a complex trigger/endpoint with appropriate values', () => {
+    it("should create a complex trigger/endpoint with appropriate values", () => {
       const result = eventarc.onCustomEventPublished(
         {
           ...FULL_OPTIONS,
-          eventType: 'event-type',
-          channel: 'locations/us-west1/channels/my-channel',
+          eventType: "event-type",
+          channel: "locations/us-west1/channels/my-channel",
         },
         () => 42
       );
 
       expect(result.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
-          channel: 'locations/us-west1/channels/my-channel',
+          channel: "locations/us-west1/channels/my-channel",
         },
       });
     });
 
-    it('should merge options and globalOptions', () => {
+    it("should merge options and globalOptions", () => {
       options.setGlobalOptions({
         concurrency: 20,
-        region: 'europe-west1',
+        region: "europe-west1",
         minInstances: 1,
       });
 
       const result = eventarc.onCustomEventPublished(
         {
-          eventType: 'event-type',
-          channel: 'locations/us-west1/channels/my-channel',
-          region: 'us-west1',
+          eventType: "event-type",
+          channel: "locations/us-west1/channels/my-channel",
+          region: "us-west1",
           minInstances: 3,
         },
         () => 42
       );
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         concurrency: 20,
         minInstances: 3,
-        region: ['us-west1'],
+        region: ["us-west1"],
         labels: {},
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
-          channel: 'locations/us-west1/channels/my-channel',
+          channel: "locations/us-west1/channels/my-channel",
         },
       });
     });
diff --git a/spec/v2/providers/fixtures.ts b/spec/v2/providers/fixtures.ts
index f330efed1..f2c5b60e6 100644
--- a/spec/v2/providers/fixtures.ts
+++ b/spec/v2/providers/fixtures.ts
@@ -1,60 +1,19 @@
-import { ManifestEndpoint } from '../../../src/runtime/manifest';
-import { TriggerAnnotation } from '../../../src/v2/core';
-import * as options from '../../../src/v2/options';
+import * as options from "../../../src/v2/options";
 
 export const FULL_OPTIONS: options.GlobalOptions = {
-  region: 'us-west1',
-  memory: '512MiB',
+  region: "us-west1",
+  memory: "512MiB",
   timeoutSeconds: 60,
   minInstances: 1,
   maxInstances: 3,
   concurrency: 20,
-  vpcConnector: 'aConnector',
-  vpcConnectorEgressSettings: 'ALL_TRAFFIC',
-  serviceAccount: 'root@',
-  ingressSettings: 'ALLOW_ALL',
-  cpu: 'gcf_gen1',
+  vpcConnector: "aConnector",
+  vpcConnectorEgressSettings: "ALL_TRAFFIC",
+  serviceAccount: "root@",
+  ingressSettings: "ALLOW_ALL",
+  cpu: "gcf_gen1",
   labels: {
-    hello: 'world',
+    hello: "world",
   },
-  secrets: ['MY_SECRET'],
-};
-
-export const FULL_TRIGGER: TriggerAnnotation = {
-  platform: 'gcfv2',
-  regions: ['us-west1'],
-  availableMemoryMb: 512,
-  timeout: '60s',
-  minInstances: 1,
-  maxInstances: 3,
-  concurrency: 20,
-  vpcConnector: 'aConnector',
-  vpcConnectorEgressSettings: 'ALL_TRAFFIC',
-  serviceAccountEmail: 'root@aProject.iam.gserviceaccount.com',
-  ingressSettings: 'ALLOW_ALL',
-  labels: {
-    hello: 'world',
-  },
-  secrets: ['MY_SECRET'],
-};
-
-export const FULL_ENDPOINT: ManifestEndpoint = {
-  platform: 'gcfv2',
-  region: ['us-west1'],
-  availableMemoryMb: 512,
-  timeoutSeconds: 60,
-  minInstances: 1,
-  maxInstances: 3,
-  concurrency: 20,
-  vpc: {
-    connector: 'aConnector',
-    egressSettings: 'ALL_TRAFFIC',
-  },
-  serviceAccountEmail: 'root@',
-  ingressSettings: 'ALLOW_ALL',
-  cpu: 'gcf_gen1',
-  labels: {
-    hello: 'world',
-  },
-  secretEnvironmentVariables: [{ key: 'MY_SECRET' }],
+  secrets: ["MY_SECRET"],
 };
diff --git a/spec/v2/providers/https.spec.ts b/spec/v2/providers/https.spec.ts
index 65e573849..eabf471fb 100644
--- a/spec/v2/providers/https.spec.ts
+++ b/spec/v2/providers/https.spec.ts
@@ -20,125 +20,97 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as sinon from 'sinon';
-
-import * as debug from '../../../src/common/debug';
-import * as options from '../../../src/v2/options';
-import * as https from '../../../src/v2/providers/https';
-import {
-  expectedResponseHeaders,
-  MockRequest,
-} from '../../fixtures/mockrequest';
-import { runHandler } from '../../helper';
-import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures';
-
-describe('onRequest', () => {
+import { expect } from "chai";
+import * as sinon from "sinon";
+
+import * as debug from "../../../src/common/debug";
+import * as options from "../../../src/v2/options";
+import * as https from "../../../src/v2/providers/https";
+import { expectedResponseHeaders, MockRequest } from "../../fixtures/mockrequest";
+import { runHandler } from "../../helper";
+import { FULL_OPTIONS } from "./fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
+
+describe("onRequest", () => {
   beforeEach(() => {
     options.setGlobalOptions({});
-    process.env.GCLOUD_PROJECT = 'aProject';
+    process.env.GCLOUD_PROJECT = "aProject";
   });
 
   afterEach(() => {
     delete process.env.GCLOUD_PROJECT;
   });
 
-  it('should return a minimal trigger/endpoint with appropriate values', () => {
+  it("should return a minimal trigger/endpoint with appropriate values", () => {
     const result = https.onRequest((req, res) => {
       res.send(200);
     });
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      httpsTrigger: {
-        allowInsecure: false,
-      },
-      labels: {},
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       httpsTrigger: {},
       labels: {},
     });
   });
 
-  it('should create a complex trigger/endpoint with appropriate values', () => {
+  it("should create a complex trigger/endpoint with appropriate values", () => {
     const result = https.onRequest(
       {
         ...FULL_OPTIONS,
-        region: ['us-west1', 'us-central1'],
-        invoker: ['service-account1@', 'service-account2@'],
+        region: ["us-west1", "us-central1"],
+        invoker: ["service-account1@", "service-account2@"],
       },
       (req, res) => {
         res.send(200);
       }
     );
 
-    expect(result.__trigger).to.deep.equal({
-      ...FULL_TRIGGER,
-      httpsTrigger: {
-        allowInsecure: false,
-        invoker: ['service-account1@', 'service-account2@'],
-      },
-      regions: ['us-west1', 'us-central1'],
-    });
-
     expect(result.__endpoint).to.deep.equal({
       ...FULL_ENDPOINT,
+      platform: "gcfv2",
       httpsTrigger: {
-        invoker: ['service-account1@', 'service-account2@'],
+        invoker: ["service-account1@", "service-account2@"],
       },
-      region: ['us-west1', 'us-central1'],
+      region: ["us-west1", "us-central1"],
     });
   });
 
-  it('should merge options and globalOptions', () => {
+  it("should merge options and globalOptions", () => {
     options.setGlobalOptions({
       concurrency: 20,
-      region: 'europe-west1',
+      region: "europe-west1",
       minInstances: 1,
-      invoker: 'public',
+      invoker: "public",
     });
 
     const result = https.onRequest(
       {
-        region: ['us-west1', 'us-central1'],
+        region: ["us-west1", "us-central1"],
         minInstances: 3,
-        invoker: 'private',
+        invoker: "private",
       },
       (req, res) => {
         res.send(200);
       }
     );
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      httpsTrigger: {
-        allowInsecure: false,
-        invoker: ['private'],
-      },
-      concurrency: 20,
-      minInstances: 3,
-      regions: ['us-west1', 'us-central1'],
-      labels: {},
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       httpsTrigger: {
-        invoker: ['private'],
+        invoker: ["private"],
       },
       concurrency: 20,
       minInstances: 3,
-      region: ['us-west1', 'us-central1'],
+      region: ["us-west1", "us-central1"],
       labels: {},
     });
   });
 
-  it('should be an express handler', async () => {
+  it("should be an express handler", async () => {
     const func = https.onRequest((req, res) => {
-      res.send('Works');
+      res.send("Works");
     });
 
     const req = new MockRequest(
@@ -146,19 +118,19 @@ describe('onRequest', () => {
         data: {},
       },
       {
-        'content-type': 'application/json',
-        origin: 'example.com',
+        "content-type": "application/json",
+        origin: "example.com",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const resp = await runHandler(func, req as any);
-    expect(resp.body).to.equal('Works');
+    expect(resp.body).to.equal("Works");
   });
 
-  it('should enforce CORS options', async () => {
-    const func = https.onRequest({ cors: 'example.com' }, (req, res) => {
-      throw new Error('Should not reach here for OPTIONS preflight');
+  it("should enforce CORS options", async () => {
+    const func = https.onRequest({ cors: "example.com" }, () => {
+      throw new Error("Should not reach here for OPTIONS preflight");
     });
 
     const req = new MockRequest(
@@ -166,32 +138,29 @@ describe('onRequest', () => {
         data: {},
       },
       {
-        'Access-Control-Request-Method': 'POST',
-        'Access-Control-Request-Headers': 'origin',
-        origin: 'example.com',
+        "Access-Control-Request-Method": "POST",
+        "Access-Control-Request-Headers": "origin",
+        origin: "example.com",
       }
     );
-    req.method = 'OPTIONS';
+    req.method = "OPTIONS";
 
     const resp = await runHandler(func, req as any);
     expect(resp.status).to.equal(204);
     expect(resp.body).to.be.undefined;
     expect(resp.headers).to.deep.equal({
-      'Access-Control-Allow-Methods': 'GET,HEAD,PUT,PATCH,POST,DELETE',
-      'Access-Control-Allow-Origin': 'example.com',
-      'Content-Length': '0',
-      Vary: 'Origin, Access-Control-Request-Headers',
+      "Access-Control-Allow-Methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
+      "Access-Control-Allow-Origin": "example.com",
+      "Content-Length": "0",
+      Vary: "Origin, Access-Control-Request-Headers",
     });
   });
 
-  it('should add CORS headers if debug feature is enabled', async () => {
-    sinon
-      .stub(debug, 'isDebugFeatureEnabled')
-      .withArgs('enableCors')
-      .returns(true);
+  it("should add CORS headers if debug feature is enabled", async () => {
+    sinon.stub(debug, "isDebugFeatureEnabled").withArgs("enableCors").returns(true);
 
-    const func = https.onRequest((req, res) => {
-      throw new Error('Should not reach here for OPTIONS preflight');
+    const func = https.onRequest(() => {
+      throw new Error("Should not reach here for OPTIONS preflight");
     });
 
     const req = new MockRequest(
@@ -199,152 +168,121 @@ describe('onRequest', () => {
         data: {},
       },
       {
-        'Access-Control-Request-Method': 'POST',
-        'Access-Control-Request-Headers': 'origin',
-        origin: 'localhost',
+        "Access-Control-Request-Method": "POST",
+        "Access-Control-Request-Headers": "origin",
+        origin: "localhost",
       }
     );
-    req.method = 'OPTIONS';
+    req.method = "OPTIONS";
 
     const resp = await runHandler(func, req as any);
     expect(resp.status).to.equal(204);
     expect(resp.body).to.be.undefined;
     expect(resp.headers).to.deep.equal({
-      'Access-Control-Allow-Methods': 'GET,HEAD,PUT,PATCH,POST,DELETE',
-      'Access-Control-Allow-Origin': 'localhost',
-      'Content-Length': '0',
-      Vary: 'Origin, Access-Control-Request-Headers',
+      "Access-Control-Allow-Methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
+      "Access-Control-Allow-Origin": "localhost",
+      "Content-Length": "0",
+      Vary: "Origin, Access-Control-Request-Headers",
     });
 
     sinon.restore();
   });
 });
 
-describe('onCall', () => {
+describe("onCall", () => {
   beforeEach(() => {
     options.setGlobalOptions({});
-    process.env.GCLOUD_PROJECT = 'aProject';
+    process.env.GCLOUD_PROJECT = "aProject";
   });
 
   afterEach(() => {
     delete process.env.GCLOUD_PROJECT;
   });
 
-  it('should return a minimal trigger/endpoint with appropriate values', () => {
-    const result = https.onCall((request) => 42);
-
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      httpsTrigger: {
-        allowInsecure: false,
-      },
-      labels: {
-        'deployment-callable': 'true',
-      },
-    });
+  it("should return a minimal trigger/endpoint with appropriate values", () => {
+    const result = https.onCall(() => 42);
 
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       callableTrigger: {},
       labels: {},
     });
   });
 
-  it('should create a complex trigger/endpoint with appropriate values', () => {
-    const result = https.onCall(FULL_OPTIONS, (request) => 42);
-
-    expect(result.__trigger).to.deep.equal({
-      ...FULL_TRIGGER,
-      httpsTrigger: {
-        allowInsecure: false,
-      },
-      labels: {
-        ...FULL_TRIGGER.labels,
-        'deployment-callable': 'true',
-      },
-    });
+  it("should create a complex trigger/endpoint with appropriate values", () => {
+    const result = https.onCall(FULL_OPTIONS, () => 42);
 
     expect(result.__endpoint).to.deep.equal({
       ...FULL_ENDPOINT,
+      platform: "gcfv2",
       callableTrigger: {},
     });
   });
 
-  it('should merge options and globalOptions', () => {
+  it("should merge options and globalOptions", () => {
     options.setGlobalOptions({
       concurrency: 20,
-      region: 'europe-west1',
+      region: "europe-west1",
       minInstances: 1,
     });
 
     const result = https.onCall(
       {
-        region: ['us-west1', 'us-central1'],
+        region: ["us-west1", "us-central1"],
         minInstances: 3,
       },
-      (request) => 42
+      () => 42
     );
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      httpsTrigger: {
-        allowInsecure: false,
-      },
-      concurrency: 20,
-      minInstances: 3,
-      regions: ['us-west1', 'us-central1'],
-      labels: {
-        'deployment-callable': 'true',
-      },
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       callableTrigger: {},
       concurrency: 20,
       minInstances: 3,
-      region: ['us-west1', 'us-central1'],
+      region: ["us-west1", "us-central1"],
       labels: {},
     });
   });
 
-  it('has a .run method', () => {
+  it("has a .run method", () => {
     const cf = https.onCall((request) => {
       return request;
     });
 
     const request: any = {
-      data: 'data',
-      instanceIdToken: 'token',
+      data: "data",
+      instanceIdToken: "token",
       auth: {
-        uid: 'abc',
-        token: 'token',
+        uid: "abc",
+        token: "token",
       },
     };
     expect(cf.run(request)).to.deep.equal(request);
   });
 
-  it('should be an express handler', async () => {
-    const func = https.onCall((request) => 42);
+  it("should be an express handler", async () => {
+    const func = https.onCall(() => 42);
 
     const req = new MockRequest(
       {
         data: {},
       },
       {
-        'content-type': 'application/json',
-        origin: 'example.com',
+        "content-type": "application/json",
+        origin: "example.com",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const resp = await runHandler(func, req as any);
     expect(resp.body).to.deep.equal({ result: 42 });
   });
 
-  it('should enforce CORS options', async () => {
-    const func = https.onCall({ cors: 'example.com' }, (request) => {
-      throw new Error('Should not reach here for OPTIONS preflight');
+  it("should enforce CORS options", async () => {
+    const func = https.onCall({ cors: "example.com" }, () => {
+      throw new Error("Should not reach here for OPTIONS preflight");
     });
 
     const req = new MockRequest(
@@ -352,71 +290,68 @@ describe('onCall', () => {
         data: {},
       },
       {
-        'Access-Control-Request-Method': 'POST',
-        'Access-Control-Request-Headers': 'origin',
-        origin: 'example.com',
+        "Access-Control-Request-Method": "POST",
+        "Access-Control-Request-Headers": "origin",
+        origin: "example.com",
       }
     );
-    req.method = 'OPTIONS';
+    req.method = "OPTIONS";
 
     const resp = await runHandler(func, req as any);
     expect(resp.status).to.equal(204);
     expect(resp.body).to.be.undefined;
     expect(resp.headers).to.deep.equal({
-      'Access-Control-Allow-Methods': 'POST',
-      'Access-Control-Allow-Origin': 'example.com',
-      'Content-Length': '0',
-      Vary: 'Origin, Access-Control-Request-Headers',
+      "Access-Control-Allow-Methods": "POST",
+      "Access-Control-Allow-Origin": "example.com",
+      "Content-Length": "0",
+      Vary: "Origin, Access-Control-Request-Headers",
     });
   });
 
-  it('overrides CORS headers if debug feature is enabled', async () => {
-    sinon
-      .stub(debug, 'isDebugFeatureEnabled')
-      .withArgs('enableCors')
-      .returns(true);
+  it("overrides CORS headers if debug feature is enabled", async () => {
+    sinon.stub(debug, "isDebugFeatureEnabled").withArgs("enableCors").returns(true);
 
-    const func = https.onCall({ cors: 'example.com' }, (request) => {
-      throw new Error('Should not reach here for OPTIONS preflight');
+    const func = https.onCall({ cors: "example.com" }, () => {
+      throw new Error("Should not reach here for OPTIONS preflight");
     });
     const req = new MockRequest(
       {
         data: {},
       },
       {
-        'Access-Control-Request-Method': 'POST',
-        'Access-Control-Request-Headers': 'origin',
-        origin: 'localhost',
+        "Access-Control-Request-Method": "POST",
+        "Access-Control-Request-Headers": "origin",
+        origin: "localhost",
       }
     );
-    req.method = 'OPTIONS';
+    req.method = "OPTIONS";
 
     const response = await runHandler(func, req as any);
 
     expect(response.status).to.equal(204);
     expect(response.body).to.be.undefined;
     expect(response.headers).to.deep.equal({
-      'Access-Control-Allow-Methods': 'POST',
-      'Access-Control-Allow-Origin': 'localhost',
-      'Content-Length': '0',
-      Vary: 'Origin, Access-Control-Request-Headers',
+      "Access-Control-Allow-Methods": "POST",
+      "Access-Control-Allow-Origin": "localhost",
+      "Content-Length": "0",
+      Vary: "Origin, Access-Control-Request-Headers",
     });
 
     sinon.restore();
   });
 
-  it('adds CORS headers', async () => {
-    const func = https.onCall((request) => 42);
+  it("adds CORS headers", async () => {
+    const func = https.onCall(() => 42);
     const req = new MockRequest(
       {
         data: {},
       },
       {
-        'content-type': 'application/json',
-        origin: 'example.com',
+        "content-type": "application/json",
+        origin: "example.com",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const response = await runHandler(func, req as any);
 
@@ -426,19 +361,13 @@ describe('onCall', () => {
   });
 
   // These tests pass if the code transpiles
-  it('allows desirable syntax', () => {
+  it("allows desirable syntax", () => {
     https.onCall<string, string>(
       (request: https.CallableRequest<string>) => `hello, ${request.data}!`
     );
-    https.onCall<string>(
-      (request: https.CallableRequest<string>) => `hello, ${request.data}!`
-    );
-    https.onCall<string>(
-      (request: https.CallableRequest) => `hello, ${request.data}!`
-    );
-    https.onCall(
-      (request: https.CallableRequest<string>) => `Hello, ${request.data}`
-    );
+    https.onCall<string>((request: https.CallableRequest<string>) => `hello, ${request.data}!`);
+    https.onCall<string>((request: https.CallableRequest) => `hello, ${request.data}!`);
+    https.onCall((request: https.CallableRequest<string>) => `Hello, ${request.data}`);
     https.onCall((request: https.CallableRequest) => `Hello, ${request.data}`);
   });
 });
diff --git a/spec/v2/providers/identity.spec.ts b/spec/v2/providers/identity.spec.ts
index 4c8b19d3d..7559a4133 100644
--- a/spec/v2/providers/identity.spec.ts
+++ b/spec/v2/providers/identity.spec.ts
@@ -19,11 +19,12 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-import { expect } from 'chai';
-import * as identity from '../../../src/v2/providers/identity';
+import { expect } from "chai";
+import * as identity from "../../../src/v2/providers/identity";
+import { MINIMAL_V2_ENDPOINT } from "../../fixtures";
 
 const BEFORE_CREATE_TRIGGER = {
-  eventType: 'providers/cloud.auth/eventTypes/user.beforeCreate',
+  eventType: "providers/cloud.auth/eventTypes/user.beforeCreate",
   options: {
     accessToken: false,
     idToken: false,
@@ -32,7 +33,7 @@ const BEFORE_CREATE_TRIGGER = {
 };
 
 const BEFORE_SIGN_IN_TRIGGER = {
-  eventType: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
+  eventType: "providers/cloud.auth/eventTypes/user.beforeSignIn",
   options: {
     accessToken: false,
     idToken: false,
@@ -44,35 +45,37 @@ const opts: identity.BlockingOptions = {
   accessToken: true,
   refreshToken: false,
   minInstances: 1,
-  region: 'us-west1',
+  region: "us-west1",
 };
 
-describe('identity', () => {
-  describe('beforeUserCreated', () => {
-    it('should accept a handler', () => {
-      const fn = identity.beforeUserCreated((event) => Promise.resolve());
+describe("identity", () => {
+  describe("beforeUserCreated", () => {
+    it("should accept a handler", () => {
+      const fn = identity.beforeUserCreated(() => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         blockingTrigger: BEFORE_CREATE_TRIGGER,
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
 
-    it('should accept options and a handler', () => {
-      const fn = identity.beforeUserCreated(opts, (event) => Promise.resolve());
+    it("should accept options and a handler", () => {
+      const fn = identity.beforeUserCreated(opts, () => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         minInstances: 1,
-        region: ['us-west1'],
+        region: ["us-west1"],
         blockingTrigger: {
           ...BEFORE_CREATE_TRIGGER,
           options: {
@@ -83,40 +86,40 @@ describe('identity', () => {
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
   });
 
-  describe('beforeUserSignedIn', () => {
-    it('should accept a handler', () => {
-      const fn = identity.beforeUserSignedIn((event) => Promise.resolve());
+  describe("beforeUserSignedIn", () => {
+    it("should accept a handler", () => {
+      const fn = identity.beforeUserSignedIn(() => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         blockingTrigger: BEFORE_SIGN_IN_TRIGGER,
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
 
-    it('should accept options and a handler', () => {
-      const fn = identity.beforeUserSignedIn(opts, (event) =>
-        Promise.resolve()
-      );
+    it("should accept options and a handler", () => {
+      const fn = identity.beforeUserSignedIn(opts, () => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         minInstances: 1,
-        region: ['us-west1'],
+        region: ["us-west1"],
         blockingTrigger: {
           ...BEFORE_SIGN_IN_TRIGGER,
           options: {
@@ -127,64 +130,57 @@ describe('identity', () => {
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
   });
 
-  describe('beforeOperation', () => {
-    it('should handle eventType and handler for before create events', () => {
-      const fn = identity.beforeOperation(
-        'beforeCreate',
-        (event) => Promise.resolve(),
-        undefined
-      );
+  describe("beforeOperation", () => {
+    it("should handle eventType and handler for before create events", () => {
+      const fn = identity.beforeOperation("beforeCreate", () => Promise.resolve(), undefined);
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         blockingTrigger: BEFORE_CREATE_TRIGGER,
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
 
-    it('should handle eventType and handler for before sign in events', () => {
-      const fn = identity.beforeOperation(
-        'beforeSignIn',
-        (event) => Promise.resolve(),
-        undefined
-      );
+    it("should handle eventType and handler for before sign in events", () => {
+      const fn = identity.beforeOperation("beforeSignIn", () => Promise.resolve(), undefined);
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         blockingTrigger: BEFORE_SIGN_IN_TRIGGER,
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
 
-    it('should handle eventType, options, and handler for before create events', () => {
-      const fn = identity.beforeOperation('beforeCreate', opts, (event) =>
-        Promise.resolve()
-      );
+    it("should handle eventType, options, and handler for before create events", () => {
+      const fn = identity.beforeOperation("beforeCreate", opts, () => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         minInstances: 1,
-        region: ['us-west1'],
+        region: ["us-west1"],
         blockingTrigger: {
           ...BEFORE_CREATE_TRIGGER,
           options: {
@@ -195,22 +191,21 @@ describe('identity', () => {
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
 
-    it('should handle eventType, options, and handler for before sign in events', () => {
-      const fn = identity.beforeOperation('beforeSignIn', opts, (event) =>
-        Promise.resolve()
-      );
+    it("should handle eventType, options, and handler for before sign in events", () => {
+      const fn = identity.beforeOperation("beforeSignIn", opts, () => Promise.resolve());
 
       expect(fn.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         minInstances: 1,
-        region: ['us-west1'],
+        region: ["us-west1"],
         blockingTrigger: {
           ...BEFORE_SIGN_IN_TRIGGER,
           options: {
@@ -221,15 +216,15 @@ describe('identity', () => {
       });
       expect(fn.__requiredAPIs).to.deep.equal([
         {
-          api: 'identitytoolkit.googleapis.com',
-          reason: 'Needed for auth blocking functions',
+          api: "identitytoolkit.googleapis.com",
+          reason: "Needed for auth blocking functions",
         },
       ]);
     });
   });
 
-  describe('getOpts', () => {
-    it('should parse an empty object', () => {
+  describe("getOpts", () => {
+    it("should parse an empty object", () => {
       const internalOpts = identity.getOpts({});
 
       expect(internalOpts).to.deep.equal({
@@ -240,12 +235,12 @@ describe('identity', () => {
       });
     });
 
-    it('should parse global options', () => {
-      const internalOpts = identity.getOpts({ region: 'us-central1', cpu: 2 });
+    it("should parse global options", () => {
+      const internalOpts = identity.getOpts({ region: "us-central1", cpu: 2 });
 
       expect(internalOpts).to.deep.equal({
         opts: {
-          region: 'us-central1',
+          region: "us-central1",
           cpu: 2,
         },
         accessToken: false,
@@ -254,9 +249,9 @@ describe('identity', () => {
       });
     });
 
-    it('should a full options', () => {
+    it("should a full options", () => {
       const internalOpts = identity.getOpts({
-        region: 'us-central1',
+        region: "us-central1",
         cpu: 2,
         accessToken: true,
         idToken: false,
@@ -265,7 +260,7 @@ describe('identity', () => {
 
       expect(internalOpts).to.deep.equal({
         opts: {
-          region: 'us-central1',
+          region: "us-central1",
           cpu: 2,
         },
         accessToken: true,
diff --git a/spec/v2/providers/pubsub.spec.ts b/spec/v2/providers/pubsub.spec.ts
index 395dadace..396dbd406 100644
--- a/spec/v2/providers/pubsub.spec.ts
+++ b/spec/v2/providers/pubsub.spec.ts
@@ -1,161 +1,134 @@
-import { expect } from 'chai';
+import { expect } from "chai";
 
-import { CloudEvent } from '../../../src/v2/core';
-import * as options from '../../../src/v2/options';
-import * as pubsub from '../../../src/v2/providers/pubsub';
-import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures';
+import { CloudEvent } from "../../../src/v2/core";
+import { FULL_OPTIONS } from "./fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
+import * as options from "../../../src/v2/options";
+import * as pubsub from "../../../src/v2/providers/pubsub";
 
 const EVENT_TRIGGER = {
-  eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
-  resource: 'projects/aProject/topics/topic',
+  eventType: "google.cloud.pubsub.topic.v1.messagePublished",
+  resource: "projects/aProject/topics/topic",
 };
 
 const ENDPOINT_EVENT_TRIGGER = {
-  eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
+  eventType: "google.cloud.pubsub.topic.v1.messagePublished",
   eventFilters: {
-    topic: 'topic',
+    topic: "topic",
   },
   retry: false,
 };
 
-describe('onMessagePublished', () => {
+describe("onMessagePublished", () => {
   beforeEach(() => {
     options.setGlobalOptions({});
-    process.env.GCLOUD_PROJECT = 'aProject';
+    process.env.GCLOUD_PROJECT = "aProject";
   });
 
   afterEach(() => {
     delete process.env.GCLOUD_PROJECT;
   });
 
-  it('should return a minimal trigger/endpoint with appropriate values', () => {
-    const result = pubsub.onMessagePublished('topic', () => 42);
-
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      eventTrigger: EVENT_TRIGGER,
-      labels: {},
-    });
+  it("should return a minimal trigger/endpoint with appropriate values", () => {
+    const result = pubsub.onMessagePublished("topic", () => 42);
 
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       eventTrigger: ENDPOINT_EVENT_TRIGGER,
       labels: {},
     });
   });
 
-  it('should create a complex trigger/endpoint with appropriate values', () => {
-    const result = pubsub.onMessagePublished(
-      { ...FULL_OPTIONS, topic: 'topic' },
-      () => 42
-    );
-
-    expect(result.__trigger).to.deep.equal({
-      ...FULL_TRIGGER,
-      eventTrigger: EVENT_TRIGGER,
-    });
+  it("should create a complex trigger/endpoint with appropriate values", () => {
+    const result = pubsub.onMessagePublished({ ...FULL_OPTIONS, topic: "topic" }, () => 42);
 
     expect(result.__endpoint).to.deep.equal({
       ...FULL_ENDPOINT,
+      platform: "gcfv2",
       eventTrigger: ENDPOINT_EVENT_TRIGGER,
     });
   });
 
-  it('should merge options and globalOptions', () => {
+  it("should merge options and globalOptions", () => {
     options.setGlobalOptions({
       concurrency: 20,
-      region: 'europe-west1',
+      region: "europe-west1",
       minInstances: 1,
     });
 
     const result = pubsub.onMessagePublished(
       {
-        topic: 'topic',
-        region: 'us-west1',
+        topic: "topic",
+        region: "us-west1",
         minInstances: 3,
       },
       () => 42
     );
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      concurrency: 20,
-      minInstances: 3,
-      regions: ['us-west1'],
-      labels: {},
-      eventTrigger: EVENT_TRIGGER,
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       concurrency: 20,
       minInstances: 3,
-      region: ['us-west1'],
+      region: ["us-west1"],
       labels: {},
       eventTrigger: ENDPOINT_EVENT_TRIGGER,
     });
   });
 
-  it('should convert retry option if appropriate', () => {
+  it("should convert retry option if appropriate", () => {
     const result = pubsub.onMessagePublished(
       {
-        topic: 'topic',
-        region: 'us-west1',
+        topic: "topic",
+        region: "us-west1",
         minInstances: 3,
         retry: true,
       },
       () => 42
     );
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      minInstances: 3,
-      regions: ['us-west1'],
-      labels: {},
-      eventTrigger: EVENT_TRIGGER,
-      failurePolicy: { retry: true },
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       minInstances: 3,
-      region: ['us-west1'],
+      region: ["us-west1"],
       labels: {},
       eventTrigger: { ...ENDPOINT_EVENT_TRIGGER, retry: true },
     });
   });
 
-  it('should have a .run method', () => {
-    const func = pubsub.onMessagePublished('topic', (event) => event);
+  it("should have a .run method", () => {
+    const func = pubsub.onMessagePublished("topic", (event) => event);
 
-    const res = func.run('input' as any);
+    const res = func.run("input" as any);
 
-    expect(res).to.equal('input');
+    expect(res).to.equal("input");
   });
 
-  it('should parse pubsub messages', () => {
+  it("should parse pubsub messages", () => {
     let json: unknown;
     const messageJSON = {
-      messageId: 'uuid',
-      data: Buffer.from(JSON.stringify({ hello: 'world' })).toString('base64'),
-      attributes: { key: 'value' },
-      orderingKey: 'orderingKey',
+      messageId: "uuid",
+      data: Buffer.from(JSON.stringify({ hello: "world" })).toString("base64"),
+      attributes: { key: "value" },
+      orderingKey: "orderingKey",
       publishTime: new Date(Date.now()).toISOString(),
     };
     const publishData: pubsub.MessagePublishedData<any> = {
       message: messageJSON as any,
-      subscription: 'projects/aProject/subscriptions/aSubscription',
+      subscription: "projects/aProject/subscriptions/aSubscription",
     };
     const event: CloudEvent<pubsub.MessagePublishedData<any>> = {
-      specversion: '1.0',
-      source: '//pubsub.googleapis.com/projects/aProject/topics/topic',
-      id: 'uuid',
+      specversion: "1.0",
+      source: "//pubsub.googleapis.com/projects/aProject/topics/topic",
+      id: "uuid",
       type: EVENT_TRIGGER.eventType,
       time: messageJSON.publishTime,
       data: publishData,
     };
 
-    const func = pubsub.onMessagePublished('topic', (event) => {
+    const func = pubsub.onMessagePublished("topic", (event) => {
       json = event.data.message.json;
       return event;
     });
@@ -166,26 +139,30 @@ describe('onMessagePublished', () => {
     // Message is a class and we passed an interface.
     expect(eventAgain).to.deep.equal(event);
 
-    expect(json).to.deep.equal({ hello: 'world' });
+    expect(json).to.deep.equal({ hello: "world" });
   });
 
   // These tests pass if the transpiler works
-  it('allows desirable syntax', () => {
+  it("allows desirable syntax", () => {
     pubsub.onMessagePublished<string>(
-      'topic',
-      (event: CloudEvent<pubsub.MessagePublishedData<string>>) => {}
+      "topic",
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      (event: CloudEvent<pubsub.MessagePublishedData<string>>) => undefined
     );
     pubsub.onMessagePublished<string>(
-      'topic',
-      (event: CloudEvent<pubsub.MessagePublishedData>) => {}
+      "topic",
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      (event: CloudEvent<pubsub.MessagePublishedData>) => undefined
     );
     pubsub.onMessagePublished(
-      'topic',
-      (event: CloudEvent<pubsub.MessagePublishedData<string>>) => {}
+      "topic",
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      (event: CloudEvent<pubsub.MessagePublishedData<string>>) => undefined
     );
     pubsub.onMessagePublished(
-      'topic',
-      (event: CloudEvent<pubsub.MessagePublishedData>) => {}
+      "topic",
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      (event: CloudEvent<pubsub.MessagePublishedData>) => undefined
     );
   });
 });
diff --git a/spec/v2/providers/remoteConfig.spec.ts b/spec/v2/providers/remoteConfig.spec.ts
new file mode 100644
index 000000000..5faf907ec
--- /dev/null
+++ b/spec/v2/providers/remoteConfig.spec.ts
@@ -0,0 +1,77 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { expect } from "chai";
+import * as remoteConfig from "../../../src/v2/providers/remoteConfig";
+import * as options from "../../../src/v2/options";
+import { MINIMAL_V2_ENDPOINT } from "../../fixtures";
+
+describe("onConfigUpdated", () => {
+  afterEach(() => {
+    options.setGlobalOptions({});
+  });
+
+  it("should create a function with a handler", () => {
+    const fn = remoteConfig.onConfigUpdated(() => 2);
+
+    expect(fn.__endpoint).to.deep.eq({
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
+      labels: {},
+      eventTrigger: {
+        eventType: remoteConfig.eventType,
+        eventFilters: {},
+        retry: false,
+      },
+    });
+    expect(fn.run(1 as any)).to.eq(2);
+  });
+
+  it("should create a function with opts and a handler", () => {
+    options.setGlobalOptions({
+      memory: "512MiB",
+      region: "us-west1",
+    });
+
+    const fn = remoteConfig.onConfigUpdated(
+      {
+        region: "us-central1",
+        retry: true,
+      },
+      () => 2
+    );
+
+    expect(fn.__endpoint).to.deep.eq({
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
+      availableMemoryMb: 512,
+      region: ["us-central1"],
+      labels: {},
+      eventTrigger: {
+        eventType: remoteConfig.eventType,
+        eventFilters: {},
+        retry: true,
+      },
+    });
+    expect(fn.run(1 as any)).to.eq(2);
+  });
+});
diff --git a/spec/v2/providers/scheduler.spec.ts b/spec/v2/providers/scheduler.spec.ts
index 7d690cbe5..5ca9fb407 100644
--- a/spec/v2/providers/scheduler.spec.ts
+++ b/spec/v2/providers/scheduler.spec.ts
@@ -20,34 +20,49 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import * as schedule from '../../../src/v2/providers/scheduler';
+import { expect } from "chai";
+import { ManifestEndpoint } from "../../../src/runtime/manifest";
+import * as options from "../../../src/v2/options";
+import * as schedule from "../../../src/v2/providers/scheduler";
+import { MINIMAL_V2_ENDPOINT } from "../../fixtures";
 
-describe('schedule', () => {
-  describe('getOpts', () => {
-    it('should handle a schedule', () => {
-      expect(schedule.getOpts('* * * * *')).to.deep.eq({
-        schedule: '* * * * *',
+const MINIMAL_SCHEDULE_TRIGGER: ManifestEndpoint["scheduleTrigger"] = {
+  schedule: "",
+  timeZone: options.RESET_VALUE,
+  retryConfig: {
+    retryCount: options.RESET_VALUE,
+    maxRetrySeconds: options.RESET_VALUE,
+    minBackoffSeconds: options.RESET_VALUE,
+    maxBackoffSeconds: options.RESET_VALUE,
+    maxDoublings: options.RESET_VALUE,
+  },
+};
+
+describe("schedule", () => {
+  describe("getOpts", () => {
+    it("should handle a schedule", () => {
+      expect(schedule.getOpts("* * * * *")).to.deep.eq({
+        schedule: "* * * * *",
         opts: {},
       });
     });
 
-    it('should handle full options', () => {
+    it("should handle full options", () => {
       const options: schedule.ScheduleOptions = {
-        schedule: '* * * * *',
-        timeZone: 'utc',
+        schedule: "* * * * *",
+        timeZone: "utc",
         retryCount: 3,
         maxRetrySeconds: 1,
         minBackoffSeconds: 2,
         maxBackoffSeconds: 3,
         maxDoublings: 4,
-        memory: '128MiB',
-        region: 'us-central1',
+        memory: "128MiB",
+        region: "us-central1",
       };
 
       expect(schedule.getOpts(options)).to.deep.eq({
-        schedule: '* * * * *',
-        timeZone: 'utc',
+        schedule: "* * * * *",
+        timeZone: "utc",
         retryCount: 3,
         maxRetrySeconds: 1,
         minBackoffSeconds: 2,
@@ -55,56 +70,58 @@ describe('schedule', () => {
         maxDoublings: 4,
         opts: {
           ...options,
-          memory: '128MiB',
-          region: 'us-central1',
+          memory: "128MiB",
+          region: "us-central1",
         },
       });
     });
   });
 
-  describe('onSchedule', () => {
-    it('should create a schedule function given a schedule', () => {
-      const schfn = schedule.onSchedule('* * * * *', (event) => console.log(1));
+  describe("onSchedule", () => {
+    it("should create a schedule function given a schedule", () => {
+      const schfn = schedule.onSchedule("* * * * *", () => console.log(1));
 
       expect(schfn.__endpoint).to.deep.eq({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         scheduleTrigger: {
-          schedule: '* * * * *',
-          retryConfig: {},
+          ...MINIMAL_SCHEDULE_TRIGGER,
+          schedule: "* * * * *",
         },
       });
       expect(schfn.__requiredAPIs).to.deep.eq([
         {
-          api: 'cloudscheduler.googleapis.com',
-          reason: 'Needed for scheduled functions.',
+          api: "cloudscheduler.googleapis.com",
+          reason: "Needed for scheduled functions.",
         },
       ]);
     });
 
-    it('should create a schedule function given options', () => {
+    it("should create a schedule function given options", () => {
       const schfn = schedule.onSchedule(
         {
-          schedule: '* * * * *',
-          timeZone: 'utc',
+          schedule: "* * * * *",
+          timeZone: "utc",
           retryCount: 3,
           maxRetrySeconds: 10,
           minBackoffSeconds: 11,
           maxBackoffSeconds: 12,
           maxDoublings: 2,
-          region: 'us-central1',
-          labels: { key: 'val' },
+          region: "us-central1",
+          labels: { key: "val" },
         },
-        (event) => {}
+        () => undefined
       );
 
       expect(schfn.__endpoint).to.deep.eq({
-        platform: 'gcfv2',
-        labels: { key: 'val' },
-        region: ['us-central1'],
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
+        labels: { key: "val" },
+        region: ["us-central1"],
         scheduleTrigger: {
-          schedule: '* * * * *',
-          timeZone: 'utc',
+          schedule: "* * * * *",
+          timeZone: "utc",
           retryConfig: {
             retryCount: 3,
             maxRetrySeconds: 10,
@@ -116,24 +133,24 @@ describe('schedule', () => {
       });
       expect(schfn.__requiredAPIs).to.deep.eq([
         {
-          api: 'cloudscheduler.googleapis.com',
-          reason: 'Needed for scheduled functions.',
+          api: "cloudscheduler.googleapis.com",
+          reason: "Needed for scheduled functions.",
         },
       ]);
     });
 
-    it('should have a .run method', () => {
+    it("should have a .run method", async () => {
       const testObj = {
-        foo: 'bar',
+        foo: "bar",
       };
-      const schfn = schedule.onSchedule('* * * * *', (event) => {
-        testObj.foo = 'newBar';
+      const schfn = schedule.onSchedule("* * * * *", () => {
+        testObj.foo = "newBar";
       });
 
-      schfn.run('input' as any);
+      await schfn.run("input" as any);
 
       expect(testObj).to.deep.eq({
-        foo: 'newBar',
+        foo: "newBar",
       });
     });
   });
diff --git a/spec/v2/providers/storage.spec.ts b/spec/v2/providers/storage.spec.ts
index 4f5221b6a..5a820ea7d 100644
--- a/spec/v2/providers/storage.spec.ts
+++ b/spec/v2/providers/storage.spec.ts
@@ -1,248 +1,180 @@
-import { expect } from 'chai';
-import * as sinon from 'sinon';
-import * as config from '../../../src/config';
-import * as options from '../../../src/v2/options';
-import * as storage from '../../../src/v2/providers/storage';
-import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures';
-
-const EVENT_TRIGGER = {
-  eventType: 'event-type',
-  resource: 'some-bucket',
-};
+import { expect } from "chai";
+import * as config from "../../../src/common/config";
+import * as options from "../../../src/v2/options";
+import * as storage from "../../../src/v2/providers/storage";
+import { FULL_OPTIONS } from "./fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
 
 const ENDPOINT_EVENT_TRIGGER = {
-  eventType: 'event-type',
+  eventType: "event-type",
   eventFilters: {
-    bucket: 'some-bucket',
+    bucket: "some-bucket",
   },
   retry: false,
 };
 
 const DEFAULT_BUCKET_EVENT_FILTER = {
-  bucket: 'default-bucket',
+  bucket: "default-bucket",
 };
 
 const SPECIFIC_BUCKET_EVENT_FILTER = {
-  bucket: 'my-bucket',
+  bucket: "my-bucket",
 };
 
-describe('v2/storage', () => {
-  describe('getOptsAndBucket', () => {
-    it('should return the default bucket with empty opts', () => {
-      const configStub = sinon
-        .stub(config, 'firebaseConfig')
-        .returns({ storageBucket: 'default-bucket' });
+describe("v2/storage", () => {
+  describe("getOptsAndBucket", () => {
+    it("should return the default bucket with empty opts", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
       const [opts, bucket] = storage.getOptsAndBucket({});
 
-      configStub.restore();
+      config.resetCache();
       expect(opts).to.deep.equal({});
-      expect(bucket).to.eq('default-bucket');
+      expect(bucket).to.eq("default-bucket");
     });
 
-    it('should return the default bucket with opts param', () => {
-      const configStub = sinon
-        .stub(config, 'firebaseConfig')
-        .returns({ storageBucket: 'default-bucket' });
+    it("should return the default bucket with opts param", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      const [opts, bucket] = storage.getOptsAndBucket({ region: 'us-west1' });
+      const [opts, bucket] = storage.getOptsAndBucket({ region: "us-west1" });
 
-      configStub.restore();
-      expect(opts).to.deep.equal({ region: 'us-west1' });
-      expect(bucket).to.eq('default-bucket');
+      config.resetCache();
+      expect(opts).to.deep.equal({ region: "us-west1" });
+      expect(bucket).to.eq("default-bucket");
     });
 
-    it('should return the given bucket', () => {
-      const [opts, bucket] = storage.getOptsAndBucket('my-bucket');
+    it("should return the given bucket", () => {
+      const [opts, bucket] = storage.getOptsAndBucket("my-bucket");
 
       expect(opts).to.deep.equal({});
-      expect(bucket).to.eq('my-bucket');
+      expect(bucket).to.eq("my-bucket");
     });
 
-    it('should return the given bucket and opts', () => {
+    it("should return the given bucket and opts", () => {
       const [opts, bucket] = storage.getOptsAndBucket({
-        bucket: 'my-bucket',
-        region: 'us-west1',
+        bucket: "my-bucket",
+        region: "us-west1",
       });
 
-      expect(opts).to.deep.equal({ region: 'us-west1' });
-      expect(bucket).to.eq('my-bucket');
+      expect(opts).to.deep.equal({ region: "us-west1" });
+      expect(bucket).to.eq("my-bucket");
     });
   });
 
-  describe('onOperation', () => {
-    let configStub: sinon.SinonStub;
-
+  describe("onOperation", () => {
     beforeEach(() => {
-      process.env.GCLOUD_PROJECT = 'aProject';
-      configStub = sinon.stub(config, 'firebaseConfig');
+      process.env.GCLOUD_PROJECT = "aProject";
     });
 
     afterEach(() => {
       options.setGlobalOptions({});
+      config.resetCache();
       delete process.env.GCLOUD_PROJECT;
-      configStub.restore();
     });
 
-    it('should create a minimal trigger/endpoint with bucket', () => {
-      const result = storage.onOperation('event-type', 'some-bucket', () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: EVENT_TRIGGER,
-      });
+    it("should create a minimal trigger/endpoint with bucket", () => {
+      const result = storage.onOperation("event-type", "some-bucket", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: ENDPOINT_EVENT_TRIGGER,
       });
     });
 
-    it('should create a minimal trigger/endpoint with opts', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should create a minimal trigger/endpoint with opts", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      const result = storage.onOperation(
-        'event-type',
-        { region: 'us-west1' },
-        () => 42
-      );
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...EVENT_TRIGGER,
-          resource: 'default-bucket',
-        },
-        regions: ['us-west1'],
-      });
+      const result = storage.onOperation("event-type", { region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_EVENT_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should create a minimal trigger with bucket with opts and bucket', () => {
-      const result = storage.onOperation(
-        'event-type',
-        { bucket: 'some-bucket' },
-        () => 42
-      );
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: EVENT_TRIGGER,
-      });
+    it("should create a minimal trigger with bucket with opts and bucket", () => {
+      const result = storage.onOperation("event-type", { bucket: "some-bucket" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: ENDPOINT_EVENT_TRIGGER,
       });
     });
 
-    it('should create a complex trigger/endpoint with appropriate values', () => {
+    it("should create a complex trigger/endpoint with appropriate values", () => {
       const result = storage.onOperation(
-        'event-type',
+        "event-type",
         {
           ...FULL_OPTIONS,
-          bucket: 'some-bucket',
+          bucket: "some-bucket",
         },
         () => 42
       );
 
-      expect(result.__trigger).to.deep.equal({
-        ...FULL_TRIGGER,
-        eventTrigger: EVENT_TRIGGER,
-      });
-
       expect(result.__endpoint).to.deep.equal({
         ...FULL_ENDPOINT,
+        platform: "gcfv2",
         eventTrigger: ENDPOINT_EVENT_TRIGGER,
       });
     });
 
-    it('should merge options and globalOptions', () => {
+    it("should merge options and globalOptions", () => {
       options.setGlobalOptions({
         concurrency: 20,
-        region: 'europe-west1',
+        region: "europe-west1",
         minInstances: 1,
       });
 
       const result = storage.onOperation(
-        'event-type',
+        "event-type",
         {
-          bucket: 'some-bucket',
-          region: 'us-west1',
+          bucket: "some-bucket",
+          region: "us-west1",
           minInstances: 3,
         },
         () => 42
       );
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        concurrency: 20,
-        minInstances: 3,
-        regions: ['us-west1'],
-        labels: {},
-        eventTrigger: EVENT_TRIGGER,
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         concurrency: 20,
         minInstances: 3,
-        region: ['us-west1'],
+        region: ["us-west1"],
         labels: {},
         eventTrigger: ENDPOINT_EVENT_TRIGGER,
       });
     });
   });
 
-  describe('onObjectArchived', () => {
-    const ARCHIVED_TRIGGER = {
-      ...EVENT_TRIGGER,
-      eventType: storage.archivedEvent,
-    };
+  describe("onObjectArchived", () => {
     const ENDPOINT_ARCHIVED_TRIGGER = {
       ...ENDPOINT_EVENT_TRIGGER,
       eventType: storage.archivedEvent,
     };
-    let configStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      configStub = sinon.stub(config, 'firebaseConfig');
-    });
 
     afterEach(() => {
-      configStub.restore();
+      config.resetCache();
     });
 
-    it('should accept only handler', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept only handler", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
       const result = storage.onObjectArchived(() => 42);
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...ARCHIVED_TRIGGER,
-          resource: 'default-bucket',
-        },
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_ARCHIVED_TRIGGER,
@@ -251,20 +183,12 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept bucket and handler', () => {
-      const result = storage.onObjectArchived('my-bucket', () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...ARCHIVED_TRIGGER,
-          resource: 'my-bucket',
-        },
-      });
+    it("should accept bucket and handler", () => {
+      const result = storage.onObjectArchived("my-bucket", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_ARCHIVED_TRIGGER,
@@ -273,95 +197,60 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept opts and handler', () => {
+    it("should accept opts and handler", () => {
       const result = storage.onObjectArchived(
-        { bucket: 'my-bucket', region: 'us-west1' },
+        { bucket: "my-bucket", region: "us-west1" },
         () => 42
       );
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...ARCHIVED_TRIGGER,
-          resource: 'my-bucket',
-        },
-        regions: ['us-west1'],
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_ARCHIVED_TRIGGER,
           eventFilters: SPECIFIC_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should accept opts and handler, default bucket', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
-
-      const result = storage.onObjectArchived({ region: 'us-west1' }, () => 42);
+    it("should accept opts and handler, default bucket", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...ARCHIVED_TRIGGER,
-          resource: 'default-bucket',
-        },
-        regions: ['us-west1'],
-      });
+      const result = storage.onObjectArchived({ region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_ARCHIVED_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
   });
 
-  describe('onObjectFinalized', () => {
-    const FINALIZED_TRIGGER = {
-      ...EVENT_TRIGGER,
-      eventType: storage.finalizedEvent,
-    };
+  describe("onObjectFinalized", () => {
     const ENDPOINT_FINALIZED_TRIGGER = {
       ...ENDPOINT_EVENT_TRIGGER,
       eventType: storage.finalizedEvent,
     };
-    let configStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      configStub = sinon.stub(config, 'firebaseConfig');
-    });
 
     afterEach(() => {
-      configStub.restore();
+      config.resetCache();
     });
 
-    it('should accept only handler', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept only handler", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
       const result = storage.onObjectFinalized(() => 42);
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...FINALIZED_TRIGGER,
-          resource: 'default-bucket',
-        },
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_FINALIZED_TRIGGER,
@@ -370,20 +259,12 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept bucket and handler', () => {
-      const result = storage.onObjectFinalized('my-bucket', () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...FINALIZED_TRIGGER,
-          resource: 'my-bucket',
-        },
-      });
+    it("should accept bucket and handler", () => {
+      const result = storage.onObjectFinalized("my-bucket", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_FINALIZED_TRIGGER,
@@ -392,122 +273,74 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept opts and handler', () => {
+    it("should accept opts and handler", () => {
       const result = storage.onObjectFinalized(
-        { bucket: 'my-bucket', region: 'us-west1' },
+        { bucket: "my-bucket", region: "us-west1" },
         () => 42
       );
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...FINALIZED_TRIGGER,
-          resource: 'my-bucket',
-        },
-        regions: ['us-west1'],
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_FINALIZED_TRIGGER,
           eventFilters: SPECIFIC_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should accept opts and handler, default bucket', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept opts and handler, default bucket", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      const result = storage.onObjectFinalized(
-        { region: 'us-west1' },
-        () => 42
-      );
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...FINALIZED_TRIGGER,
-          resource: 'default-bucket',
-        },
-        regions: ['us-west1'],
-      });
+      const result = storage.onObjectFinalized({ region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_FINALIZED_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
   });
 
-  describe('onObjectDeleted', () => {
-    const DELETED_TRIGGER = {
-      ...EVENT_TRIGGER,
-      eventType: storage.deletedEvent,
-    };
+  describe("onObjectDeleted", () => {
     const ENDPOINT_DELETED_TRIGGER = {
       ...ENDPOINT_EVENT_TRIGGER,
       eventType: storage.deletedEvent,
     };
-    let configStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      configStub = sinon.stub(config, 'firebaseConfig');
-    });
 
     afterEach(() => {
-      configStub.restore();
+      config.resetCache();
     });
 
-    it('should accept only handler', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept only handler", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
       const result = storage.onObjectDeleted(() => 42);
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...DELETED_TRIGGER,
-          resource: 'default-bucket',
-        },
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_DELETED_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
       });
-
-      configStub.restore();
     });
 
-    it('should accept bucket and handler', () => {
-      const result = storage.onObjectDeleted('my-bucket', () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...DELETED_TRIGGER,
-          resource: 'my-bucket',
-        },
-      });
+    it("should accept bucket and handler", () => {
+      const result = storage.onObjectDeleted("my-bucket", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_DELETED_TRIGGER,
@@ -516,119 +349,71 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept opts and handler', () => {
-      const result = storage.onObjectDeleted(
-        { bucket: 'my-bucket', region: 'us-west1' },
-        () => 42
-      );
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...DELETED_TRIGGER,
-          resource: 'my-bucket',
-        },
-        regions: ['us-west1'],
-      });
+    it("should accept opts and handler", () => {
+      const result = storage.onObjectDeleted({ bucket: "my-bucket", region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_DELETED_TRIGGER,
           eventFilters: SPECIFIC_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should accept opts and handler, default bucket', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept opts and handler, default bucket", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      const result = storage.onObjectDeleted({ region: 'us-west1' }, () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...DELETED_TRIGGER,
-          resource: 'default-bucket',
-        },
-        regions: ['us-west1'],
-      });
+      const result = storage.onObjectDeleted({ region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_DELETED_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
   });
 
-  describe('onObjectMetadataUpdated', () => {
-    const METADATA_TRIGGER = {
-      ...EVENT_TRIGGER,
-      eventType: storage.metadataUpdatedEvent,
-    };
+  describe("onObjectMetadataUpdated", () => {
     const ENDPOINT_METADATA_TRIGGER = {
       ...ENDPOINT_EVENT_TRIGGER,
       eventType: storage.metadataUpdatedEvent,
     };
-    let configStub: sinon.SinonStub;
-
-    beforeEach(() => {
-      configStub = sinon.stub(config, 'firebaseConfig');
-    });
 
     afterEach(() => {
-      configStub.restore();
+      config.resetCache();
     });
 
-    it('should accept only handler', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept only handler", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
       const result = storage.onObjectMetadataUpdated(() => 42);
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...METADATA_TRIGGER,
-          resource: 'default-bucket',
-        },
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_METADATA_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
       });
-
-      configStub.restore();
     });
 
-    it('should accept bucket and handler', () => {
-      const result = storage.onObjectMetadataUpdated('my-bucket', () => 42);
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...METADATA_TRIGGER,
-          resource: 'my-bucket',
-        },
-      });
+    it("should accept bucket and handler", () => {
+      const result = storage.onObjectMetadataUpdated("my-bucket", () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_METADATA_TRIGGER,
@@ -637,59 +422,38 @@ describe('v2/storage', () => {
       });
     });
 
-    it('should accept opts and handler', () => {
+    it("should accept opts and handler", () => {
       const result = storage.onObjectMetadataUpdated(
-        { bucket: 'my-bucket', region: 'us-west1' },
+        { bucket: "my-bucket", region: "us-west1" },
         () => 42
       );
 
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...METADATA_TRIGGER,
-          resource: 'my-bucket',
-        },
-        regions: ['us-west1'],
-      });
-
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_METADATA_TRIGGER,
           eventFilters: SPECIFIC_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
 
-    it('should accept opts and handler, default bucket', () => {
-      configStub.returns({ storageBucket: 'default-bucket' });
+    it("should accept opts and handler, default bucket", () => {
+      config.resetCache({ storageBucket: "default-bucket" });
 
-      const result = storage.onObjectMetadataUpdated(
-        { region: 'us-west1' },
-        () => 42
-      );
-
-      expect(result.__trigger).to.deep.equal({
-        platform: 'gcfv2',
-        labels: {},
-        eventTrigger: {
-          ...METADATA_TRIGGER,
-          resource: 'default-bucket',
-        },
-        regions: ['us-west1'],
-      });
+      const result = storage.onObjectMetadataUpdated({ region: "us-west1" }, () => 42);
 
       expect(result.__endpoint).to.deep.equal({
-        platform: 'gcfv2',
+        ...MINIMAL_V2_ENDPOINT,
+        platform: "gcfv2",
         labels: {},
         eventTrigger: {
           ...ENDPOINT_METADATA_TRIGGER,
           eventFilters: DEFAULT_BUCKET_EVENT_FILTER,
         },
-        region: ['us-west1'],
+        region: ["us-west1"],
       });
     });
   });
diff --git a/spec/v2/providers/tasks.spec.ts b/spec/v2/providers/tasks.spec.ts
index f0f8c9cc5..8131a3725 100644
--- a/spec/v2/providers/tasks.spec.ts
+++ b/spec/v2/providers/tasks.spec.ts
@@ -20,41 +20,52 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-
-import * as options from '../../../src/v2/options';
-import { onTaskDispatched, Request } from '../../../src/v2/providers/tasks';
-import { MockRequest } from '../../fixtures/mockrequest';
-import { runHandler } from '../../helper';
-import { FULL_ENDPOINT, FULL_OPTIONS, FULL_TRIGGER } from './fixtures';
-
-describe('onTaskDispatched', () => {
+import { expect } from "chai";
+
+import { ManifestEndpoint } from "../../../src/runtime/manifest";
+import { onTaskDispatched, Request } from "../../../src/v2/providers/tasks";
+import { MockRequest } from "../../fixtures/mockrequest";
+import { runHandler } from "../../helper";
+import { FULL_OPTIONS } from "./fixtures";
+import { FULL_ENDPOINT, MINIMAL_V2_ENDPOINT } from "../../fixtures";
+import * as options from "../../../src/v2/options";
+
+const MINIMIAL_TASK_QUEUE_TRIGGER: ManifestEndpoint["taskQueueTrigger"] = {
+  rateLimits: {
+    maxConcurrentDispatches: options.RESET_VALUE,
+    maxDispatchesPerSecond: options.RESET_VALUE,
+  },
+  retryConfig: {
+    maxAttempts: options.RESET_VALUE,
+    maxBackoffSeconds: options.RESET_VALUE,
+    maxDoublings: options.RESET_VALUE,
+    maxRetrySeconds: options.RESET_VALUE,
+    minBackoffSeconds: options.RESET_VALUE,
+  },
+};
+
+describe("onTaskDispatched", () => {
   beforeEach(() => {
     options.setGlobalOptions({});
-    process.env.GCLOUD_PROJECT = 'aProject';
+    process.env.GCLOUD_PROJECT = "aProject";
   });
 
   afterEach(() => {
     delete process.env.GCLOUD_PROJECT;
   });
 
-  it('should return a minimal trigger/endpoint with appropriate values', () => {
-    const result = onTaskDispatched(() => {});
-
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      taskQueueTrigger: {},
-      labels: {},
-    });
+  it("should return a minimal trigger/endpoint with appropriate values", () => {
+    const result = onTaskDispatched(() => undefined);
 
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
-      taskQueueTrigger: {},
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       labels: {},
+      taskQueueTrigger: MINIMIAL_TASK_QUEUE_TRIGGER,
     });
   });
 
-  it('should create a complex trigger/endpoint with appropriate values', () => {
+  it("should create a complex trigger/endpoint with appropriate values", () => {
     const result = onTaskDispatched(
       {
         ...FULL_OPTIONS,
@@ -69,32 +80,14 @@ describe('onTaskDispatched', () => {
           maxConcurrentDispatches: 5,
           maxDispatchesPerSecond: 10,
         },
-        invoker: 'private',
+        invoker: "private",
       },
-      () => {}
+      () => undefined
     );
 
-    expect(result.__trigger).to.deep.equal({
-      ...FULL_TRIGGER,
-      taskQueueTrigger: {
-        retryConfig: {
-          maxAttempts: 4,
-          maxRetrySeconds: 10,
-          maxDoublings: 3,
-          minBackoffSeconds: 1,
-          maxBackoffSeconds: 2,
-        },
-        rateLimits: {
-          maxConcurrentDispatches: 5,
-          maxDispatchesPerSecond: 10,
-        },
-        invoker: ['private'],
-      },
-    });
-
     expect(result.__endpoint).to.deep.equal({
       ...FULL_ENDPOINT,
-      platform: 'gcfv2',
+      platform: "gcfv2",
       taskQueueTrigger: {
         retryConfig: {
           maxAttempts: 4,
@@ -107,47 +100,39 @@ describe('onTaskDispatched', () => {
           maxConcurrentDispatches: 5,
           maxDispatchesPerSecond: 10,
         },
-        invoker: ['private'],
+        invoker: ["private"],
       },
     });
   });
 
-  it('should merge options and globalOptions', () => {
+  it("should merge options and globalOptions", () => {
     options.setGlobalOptions({
       concurrency: 20,
-      region: 'europe-west1',
+      region: "europe-west1",
       minInstances: 1,
     });
 
     const result = onTaskDispatched(
       {
-        region: 'us-west1',
+        region: "us-west1",
         minInstances: 3,
       },
-      (request) => {}
+      () => undefined
     );
 
-    expect(result.__trigger).to.deep.equal({
-      platform: 'gcfv2',
-      taskQueueTrigger: {},
-      concurrency: 20,
-      minInstances: 3,
-      regions: ['us-west1'],
-      labels: {},
-    });
-
     expect(result.__endpoint).to.deep.equal({
-      platform: 'gcfv2',
-      taskQueueTrigger: {},
+      ...MINIMAL_V2_ENDPOINT,
+      platform: "gcfv2",
       concurrency: 20,
       minInstances: 3,
-      region: ['us-west1'],
+      region: ["us-west1"],
       labels: {},
+      taskQueueTrigger: MINIMIAL_TASK_QUEUE_TRIGGER,
     });
   });
 
-  it('has a .run method', async () => {
-    const request: any = { data: 'data' };
+  it("has a .run method", async () => {
+    const request: any = { data: "data" };
     const cf = onTaskDispatched((r) => {
       expect(r.data).to.deep.equal(request.data);
     });
@@ -155,27 +140,27 @@ describe('onTaskDispatched', () => {
     await cf.run(request);
   });
 
-  it('should be an express handler', async () => {
-    const func = onTaskDispatched((request) => {});
+  it("should be an express handler", async () => {
+    const func = onTaskDispatched(() => undefined);
 
     const req = new MockRequest(
       {
         data: {},
       },
       {
-        'content-type': 'application/json',
-        authorization: 'Bearer abc',
-        origin: 'example.com',
+        "content-type": "application/json",
+        authorization: "Bearer abc",
+        origin: "example.com",
       }
     );
-    req.method = 'POST';
+    req.method = "POST";
 
     const resp = await runHandler(func, req as any);
     expect(resp.status).to.equal(204);
   });
 
   // These tests pass if the code transpiles
-  it('allows desirable syntax', () => {
+  it("allows desirable syntax", () => {
     onTaskDispatched<string>((request: Request<string>) => {
       // There should be no lint warnings that data is not a string.
       console.log(`hello, ${request.data}`);
diff --git a/spec/v2/providers/testLab.spec.ts b/spec/v2/providers/testLab.spec.ts
new file mode 100644
index 000000000..7d59f8bca
--- /dev/null
+++ b/spec/v2/providers/testLab.spec.ts
@@ -0,0 +1,74 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { expect } from "chai";
+import * as testLab from "../../../src/v2/providers/testLab";
+import * as options from "../../../src/v2/options";
+
+describe("onTestMatrixCompleted", () => {
+  afterEach(() => {
+    options.setGlobalOptions({});
+  });
+
+  it("should create a function with a handler", () => {
+    const fn = testLab.onTestMatrixCompleted(() => 2);
+
+    expect(fn.__endpoint).to.deep.eq({
+      platform: "gcfv2",
+      labels: {},
+      eventTrigger: {
+        eventType: testLab.eventType,
+        eventFilters: {},
+        retry: false,
+      },
+    });
+    expect(fn.run(1 as any)).to.eq(2);
+  });
+
+  it("should create a function with opts and a handler", () => {
+    options.setGlobalOptions({
+      memory: "512MiB",
+      region: "us-west1",
+    });
+
+    const fn = testLab.onTestMatrixCompleted(
+      {
+        region: "us-central1",
+        retry: true,
+      },
+      () => 2
+    );
+
+    expect(fn.__endpoint).to.deep.eq({
+      platform: "gcfv2",
+      availableMemoryMb: 512,
+      region: ["us-central1"],
+      labels: {},
+      eventTrigger: {
+        eventType: testLab.eventType,
+        eventFilters: {},
+        retry: true,
+      },
+    });
+    expect(fn.run(1 as any)).to.eq(2);
+  });
+});
diff --git a/src/apps.ts b/src/apps.ts
deleted file mode 100644
index 163cd4795..000000000
--- a/src/apps.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2017 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-import * as firebase from 'firebase-admin';
-import * as _ from 'lodash';
-import { firebaseConfig } from './config';
-
-export function apps(): apps.Apps {
-  if (typeof apps.singleton === 'undefined') {
-    apps.init();
-  }
-  return apps.singleton;
-}
-
-export namespace apps {
-  /** @hidden */
-  export const garbageCollectionInterval = 2 * 60 * 1000;
-
-  /** @hidden */
-  export function delay(delay: number) {
-    return new Promise((resolve) => {
-      setTimeout(resolve, delay);
-    });
-  }
-
-  export let singleton: apps.Apps;
-
-  export let init = () => (singleton = new Apps());
-
-  export interface AuthMode {
-    admin: boolean;
-    variable?: any;
-  }
-
-  /** @hidden */
-  export interface RefCounter {
-    [appName: string]: number;
-  }
-
-  export class Apps {
-    private _refCounter: RefCounter;
-    private _emulatedAdminApp?: firebase.app.App;
-
-    constructor() {
-      this._refCounter = {};
-    }
-
-    _appAlive(appName: string): boolean {
-      try {
-        const app = firebase.app(appName);
-        return !_.get(app, 'isDeleted_');
-      } catch (e) {
-        return false;
-      }
-    }
-
-    _destroyApp(appName: string) {
-      if (!this._appAlive(appName)) {
-        return;
-      }
-      firebase
-        .app(appName)
-        .delete()
-        .catch(_.noop);
-    }
-
-    retain() {
-      const increment = (n?: number) => {
-        return (n || 0) + 1;
-      };
-      // Increment counter for admin because function might use event.data.ref
-      _.update(this._refCounter, '__admin__', increment);
-    }
-
-    release() {
-      const decrement = (n: number) => {
-        return n - 1;
-      };
-      return delay(garbageCollectionInterval).then(() => {
-        _.update(this._refCounter, '__admin__', decrement);
-        _.forEach(this._refCounter, (count, key) => {
-          if (count <= 0) {
-            this._destroyApp(key);
-          }
-        });
-      });
-    }
-
-    get admin(): firebase.app.App {
-      if (this._emulatedAdminApp) {
-        return this._emulatedAdminApp;
-      }
-
-      if (this._appAlive('__admin__')) {
-        return firebase.app('__admin__');
-      }
-      return firebase.initializeApp(this.firebaseArgs, '__admin__');
-    }
-
-    /**
-     * This function allows the Firebase Emulator Suite to override the FirebaseApp instance
-     * used by the Firebase Functions SDK. Developers should never call this function for
-     * other purposes.
-     */
-    setEmulatedAdminApp(app: firebase.app.App) {
-      this._emulatedAdminApp = app;
-    }
-
-    private get firebaseArgs() {
-      return _.assign({}, firebaseConfig(), {
-        credential: firebase.credential.applicationDefault(),
-      });
-    }
-  }
-}
diff --git a/src/bin/firebase-functions.ts b/src/bin/firebase-functions.ts
index 1be486b8c..83d131282 100644
--- a/src/bin/firebase-functions.ts
+++ b/src/bin/firebase-functions.ts
@@ -22,9 +22,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
-import { loadStack } from '../runtime/loader';
-import { stackToWire } from '../runtime/manifest';
+import * as http from "http";
+import * as express from "express";
+import { loadStack } from "../runtime/loader";
+import { stackToWire } from "../runtime/manifest";
 
 function printUsageAndExit() {
   console.error(
@@ -38,37 +39,35 @@ Arguments:
   process.exit(1);
 }
 
-let functionsDir = '.';
+let functionsDir = ".";
 
 const args = process.argv.slice(2);
 if (args.length > 1) {
-  if (args[0] === '-h' || args[0] === '--help') {
+  if (args[0] === "-h" || args[0] === "--help") {
     printUsageAndExit();
   }
   functionsDir = args[0];
 }
 
-let server;
+let server: http.Server = undefined;
 const app = express();
 
-async function handleQuitquitquit(req: express.Request, res: express.Response) {
-  res.send('ok');
-  server.close(() => console.log('shutdown requested via /__/quitquitquit'));
+function handleQuitquitquit(req: express.Request, res: express.Response) {
+  res.send("ok");
+  server.close(() => console.log("shutdown requested via /__/quitquitquit"));
 }
 
-app.get('/__/quitquitquit', handleQuitquitquit);
-app.post('/__/quitquitquit', handleQuitquitquit);
+app.get("/__/quitquitquit", handleQuitquitquit);
+app.post("/__/quitquitquit", handleQuitquitquit);
 
-if (process.env.FUNCTIONS_CONTROL_API === 'true') {
-  app.get('/__/functions.yaml', async (req, res) => {
+if (process.env.FUNCTIONS_CONTROL_API === "true") {
+  app.get("/__/functions.yaml", async (req, res) => {
     try {
       const stack = await loadStack(functionsDir);
-      res.setHeader('content-type', 'text/yaml');
+      res.setHeader("content-type", "text/yaml");
       res.send(JSON.stringify(stackToWire(stack)));
     } catch (e) {
-      res
-        .status(400)
-        .send(`Failed to generate manifest from function source: ${e}`);
+      res.status(400).send(`Failed to generate manifest from function source: ${e}`);
     }
   });
 }
@@ -78,5 +77,5 @@ if (process.env.PORT) {
   port = Number.parseInt(process.env.PORT);
 }
 
-console.log('Serving at port', port);
+console.log("Serving at port", port);
 server = app.listen(port);
diff --git a/src/common/app.ts b/src/common/app.ts
new file mode 100644
index 000000000..44f7ca929
--- /dev/null
+++ b/src/common/app.ts
@@ -0,0 +1,69 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import {
+  App,
+  applicationDefault,
+  deleteApp,
+  getApp as getAppNamed,
+  initializeApp,
+} from "firebase-admin/app";
+import { firebaseConfig } from "./config";
+
+const APP_NAME = "__FIREBASE_FUNCTIONS_SDK__";
+
+let cache: App;
+export function getApp(): App {
+  if (typeof cache === "undefined") {
+    try {
+      cache = getAppNamed(/* default */);
+    } catch {
+      // Default app does not exist. Initialize app.
+      cache = initializeApp(
+        {
+          ...firebaseConfig(),
+          credential: applicationDefault(),
+        },
+        APP_NAME
+      );
+    }
+  }
+  return cache;
+}
+
+/**
+ * This function allows the Firebase Emulator Suite to override the FirebaseApp instance
+ * used by the Firebase Functions SDK. Developers should never call this function for
+ * other purposes.
+ * N.B. For clarity for use in testing this name has no mention of emulation, but
+ * it must be exported from index as app.setEmulatedAdminApp or we break the emulator.
+ * We can remove this export when:
+ * A) We complete the new emulator and no longer depend on monkeypatching
+ * B) We tweak the CLI to look for different APIs to monkeypatch depending on versions.
+ * @alpha
+ */
+export function setApp(app?: App) {
+  if (cache?.name === APP_NAME) {
+    void deleteApp(cache);
+  }
+  cache = app;
+}
diff --git a/src/common/change.ts b/src/common/change.ts
index c0180e0a0..95afdb4eb 100644
--- a/src/common/change.ts
+++ b/src/common/change.ts
@@ -34,31 +34,26 @@ export interface ChangeJson {
    */
   before?: any;
   /**
-   * @hidden
    * Comma-separated string that represents names of fields that changed.
    */
   fieldMask?: string;
 }
 
-/** @hidden */
-export function applyFieldMask(
-  sparseBefore: any,
-  after: any,
-  fieldMask: string
-) {
+/** @internal */
+export function applyFieldMask(sparseBefore: any, after: any, fieldMask: string) {
   const before = { ...after };
-  const masks = fieldMask.split(',');
+  const masks = fieldMask.split(",");
 
   for (const mask of masks) {
-    const parts = mask.split('.');
+    const parts = mask.split(".");
     const head = parts[0];
-    const tail = parts.slice(1).join('.');
+    const tail = parts.slice(1).join(".");
     if (parts.length > 1) {
       before[head] = applyFieldMask(sparseBefore?.[head], after[head], tail);
       continue;
     }
     const val = sparseBefore?.[head];
-    if (typeof val === 'undefined') {
+    if (typeof val === "undefined") {
       delete before[mask];
     } else {
       before[mask] = val;
@@ -78,7 +73,6 @@ export function applyFieldMask(
  */
 export class Change<T> {
   /**
-   * @hidden
    * Factory method for creating a Change from a `before` object and an `after`
    * object.
    */
@@ -87,23 +81,16 @@ export class Change<T> {
   }
 
   /**
-   * @hidden
    * Factory method for creating a Change from a JSON and an optional customizer
    * function to be applied to both the `before` and the `after` fields.
    */
-  static fromJSON<T>(
-    json: ChangeJson,
-    customizer: (x: any) => T = (x) => x as T
-  ): Change<T> {
+  static fromJSON<T>(json: ChangeJson, customizer: (x: any) => T = (x) => x as T): Change<T> {
     let before = { ...json.before };
     if (json.fieldMask) {
       before = applyFieldMask(before, json.after, json.fieldMask);
     }
 
-    return Change.fromObjects(
-      customizer(before || {}),
-      customizer(json.after || {})
-    );
+    return Change.fromObjects(customizer(before || {}), customizer(json.after || {}));
   }
   constructor(public before: T, public after: T) {}
 }
diff --git a/src/common/config.ts b/src/common/config.ts
new file mode 100644
index 000000000..ac634f2e7
--- /dev/null
+++ b/src/common/config.ts
@@ -0,0 +1,57 @@
+import { AppOptions } from "firebase-admin/app";
+import { readFileSync } from "fs";
+import * as path from "path";
+
+import * as logger from "../logger";
+
+let cache: AppOptions | null = null;
+
+/**
+ * @internal
+ * @alpha
+ */
+export function resetCache(newCache: AppOptions = null) {
+  cache = newCache;
+}
+
+/**
+ * Get the fields you need to initialize a Firebase app
+ * @alpha
+ */
+export function firebaseConfig(): AppOptions | null {
+  if (cache) {
+    return cache;
+  }
+
+  let env = process.env.FIREBASE_CONFIG;
+  if (env) {
+    // Firebase Tools will always use a JSON blob in prod, but docs
+    // explicitly state that the user can set the env to a file:
+    // https://firebase.google.com/docs/admin/setup#initialize-without-parameters
+    if (!env.startsWith("{")) {
+      env = readFileSync(path.join(process.env.PWD, env)).toString("utf8");
+    }
+
+    cache = JSON.parse(env);
+    return cache;
+  }
+
+  if (process.env.GCLOUD_PROJECT) {
+    logger.warn(
+      "Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail"
+    );
+    cache = {
+      databaseURL:
+        process.env.DATABASE_URL || `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`,
+      storageBucket: process.env.STORAGE_BUCKET_URL || `${process.env.GCLOUD_PROJECT}.appspot.com`,
+      projectId: process.env.GCLOUD_PROJECT,
+    };
+    return cache;
+  } else {
+    logger.warn(
+      "Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail"
+    );
+  }
+
+  return null;
+}
diff --git a/src/common/debug.ts b/src/common/debug.ts
index 55221c9e8..22ea7637d 100644
--- a/src/common/debug.ts
+++ b/src/common/debug.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 // Do NOT turn on a debug feature in production.
-const debugMode = process.env.FIREBASE_DEBUG_MODE === 'true';
+const debugMode = process.env.FIREBASE_DEBUG_MODE === "true";
 
 interface DebugFeatures {
   skipTokenVerification?: boolean;
@@ -34,7 +34,7 @@ function loadDebugFeatures(): DebugFeatures {
   }
   try {
     const obj = JSON.parse(process.env.FIREBASE_DEBUG_FEATURES);
-    if (typeof obj !== 'object') {
+    if (typeof obj !== "object") {
       return {};
     }
     return obj as DebugFeatures;
diff --git a/src/common/encoding.ts b/src/common/encoding.ts
index 554c5fcb1..019182864 100644
--- a/src/common/encoding.ts
+++ b/src/common/encoding.ts
@@ -22,17 +22,6 @@
 
 // Copied from firebase-tools/src/gcp/proto
 
-/**
- * A type alias used to annotate interfaces as using a google.protobuf.Duration.
- * This type is parsed/encoded as a string of seconds + the "s" prefix.
- */
-export type Duration = string;
-
-/** Get a google.protobuf.Duration for a number of seconds. */
-export function durationFromSeconds(s: number): Duration {
-  return `${s}s`;
-}
-
 /**
  * Utility function to help copy fields from type A to B.
  * As a safety net, catches typos or fields that aren't named the same
@@ -72,44 +61,20 @@ export function convertIfPresent<Src, Dest>(
   dest[destField] = converter(src[srcField]);
 }
 
-export function serviceAccountFromShorthand(
-  serviceAccount: string
-): string | null {
-  if (serviceAccount === 'default') {
-    return null;
-  } else if (serviceAccount.endsWith('@')) {
-    if (!process.env.GCLOUD_PROJECT) {
-      throw new Error(
-        `Unable to determine email for service account '${serviceAccount}' because process.env.GCLOUD_PROJECT is not set.`
-      );
-    }
-    return `${serviceAccount}${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`;
-  } else if (serviceAccount.includes('@')) {
-    return serviceAccount;
-  } else {
-    throw new Error(
-      `Invalid option for serviceAccount: '${serviceAccount}'. Valid options are 'default', a service account email, or '{serviceAccountName}@'`
-    );
-  }
-}
-
 export function convertInvoker(invoker: string | string[]): string[] {
-  if (typeof invoker === 'string') {
+  if (typeof invoker === "string") {
     invoker = [invoker];
   }
 
   if (invoker.length === 0) {
-    throw new Error('Invalid option for invoker: Must be a non-empty array.');
+    throw new Error("Invalid option for invoker: Must be a non-empty array.");
   }
 
   if (invoker.find((inv) => inv.length === 0)) {
-    throw new Error('Invalid option for invoker: Must be a non-empty string.');
+    throw new Error("Invalid option for invoker: Must be a non-empty string.");
   }
 
-  if (
-    invoker.length > 1 &&
-    invoker.find((inv) => inv === 'public' || inv === 'private')
-  ) {
+  if (invoker.length > 1 && invoker.find((inv) => inv === "public" || inv === "private")) {
     throw new Error(
       "Invalid option for invoker: Cannot have 'public' or 'private' in an array of service accounts."
     );
diff --git a/src/common/options.ts b/src/common/options.ts
new file mode 100644
index 000000000..229fc1f27
--- /dev/null
+++ b/src/common/options.ts
@@ -0,0 +1,48 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+/**
+ * Special configuration type to reset configuration to platform default.
+ *
+ * @alpha
+ */
+export class ResetValue {
+  toJSON(): null {
+    return null;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  private constructor() {}
+  public static getInstance() {
+    return new ResetValue();
+  }
+}
+
+/**
+ * Special configuration value to reset configuration to platform default.
+ */
+export const RESET_VALUE = ResetValue.getInstance();
+
+/**
+ * @internal
+ */
+export type ResettableKeys<T> = Required<{
+  [K in keyof T as [ResetValue] extends [T[K]] ? K : never]: null;
+}>;
diff --git a/src/common/params.ts b/src/common/params.ts
new file mode 100644
index 000000000..a35a870b3
--- /dev/null
+++ b/src/common/params.ts
@@ -0,0 +1,87 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2021 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+/**
+ * A type that splits literal string S with delimiter D.
+ *
+ * For example Split<"a/b/c", "/"> is ['a' | "b" | "c"]
+ */
+export type Split<S extends string, D extends string> =
+  // A non-literal string splits into a string[]
+  string extends S
+    ? string[]
+    : // A literal empty string turns into a zero-tuple
+    S extends ""
+    ? []
+    : // Split the string; Head may be the empty string
+    S extends `${D}${infer Tail}`
+    ? [...Split<Tail, D>]
+    : S extends `${infer Head}${D}${infer Tail}`
+    ? // Drop types that are exactly string; they'll eat up literal string types
+      string extends Head
+      ? [...Split<Tail, D>]
+      : [Head, ...Split<Tail, D>]
+    : // A string without delimiters splits into an array of itself
+      [S];
+
+/**
+ * A type that ensure that type S is not null or undefined.
+ */
+export type NullSafe<S extends null | undefined | string> = S extends null
+  ? never
+  : S extends undefined
+  ? never
+  : S extends string
+  ? S
+  : never;
+
+/**
+ * A type that extracts parameter name enclosed in bracket as string.
+ * Ignore wildcard matches
+ *
+ * For example, Extract<"{uid}"> is "uid".
+ * For example, Extract<"{uid=*}"> is "uid".
+ * For example, Extract<"{uid=**}"> is "uid".
+ */
+export type Extract<Part extends string> = Part extends `{${infer Param}=**}`
+  ? Param
+  : Part extends `{${infer Param}=*}`
+  ? Param
+  : Part extends `{${infer Param}}`
+  ? Param
+  : never;
+
+/**
+ * A type that maps all parameter capture gropus into keys of a record.
+ * For example, ParamsOf<"users/{uid}"> is { uid: string }
+ * ParamsOf<"users/{uid}/logs/{log}"> is { uid: string; log: string }
+ * ParamsOf<"some/static/data"> is {}
+ *
+ * For flexibility reasons, ParamsOf<string> is Record<string, string>
+ */
+export type ParamsOf<PathPattern extends string> =
+  // if we have lost type information, revert back to an untyped dictionary
+  string extends PathPattern
+    ? Record<string, string>
+    : {
+        [Key in Extract<Split<NullSafe<PathPattern>, "/">[number]>]: string;
+      };
diff --git a/src/common/providers/database.ts b/src/common/providers/database.ts
index f1c41d617..e1da47c7d 100644
--- a/src/common/providers/database.ts
+++ b/src/common/providers/database.ts
@@ -20,18 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as firebase from 'firebase-admin';
-import * as _ from 'lodash';
-import { joinPath, pathParts } from '../../utilities/path';
+import { App } from "firebase-admin/app";
+import * as database from "firebase-admin/database";
+import { firebaseConfig } from "../../common/config";
+import { joinPath, pathParts } from "../../common/utilities/path";
 
 /**
- * Interface representing a Firebase Realtime Database data snapshot.
+ * Interface representing a Firebase Realtime database data snapshot.
  */
-export class DataSnapshot {
+export class DataSnapshot implements database.DataSnapshot {
   public instance: string;
 
   /** @hidden */
-  private _ref: firebase.database.Reference;
+  private _ref: database.Reference;
 
   /** @hidden */
   private _path: string;
@@ -44,11 +45,12 @@ export class DataSnapshot {
 
   constructor(
     data: any,
-    path?: string, // path will be undefined for the database root
-    private app?: firebase.app.App,
+    path?: string, // path is undefined for the database root
+    private app?: App,
     instance?: string
   ) {
-    if (app?.options?.databaseURL?.startsWith('http:')) {
+    const config = firebaseConfig();
+    if (app?.options?.databaseURL?.startsWith("http:")) {
       // In this case we're dealing with an emulator
       this.instance = app.options.databaseURL;
     } else if (instance) {
@@ -56,9 +58,10 @@ export class DataSnapshot {
       this.instance = instance;
     } else if (app) {
       this.instance = app.options.databaseURL;
+    } else if (config.databaseURL) {
+      this.instance = config.databaseURL;
     } else if (process.env.GCLOUD_PROJECT) {
-      this.instance =
-        'https://' + process.env.GCLOUD_PROJECT + '.firebaseio.com';
+      this.instance = "https://" + process.env.GCLOUD_PROJECT + "-default-rtdb.firebaseio.com";
     }
 
     this._path = path;
@@ -67,19 +70,25 @@ export class DataSnapshot {
 
   /**
    * Returns a [`Reference`](/docs/reference/admin/node/admin.database.Reference)
-   * to the Database location where the triggering write occurred. Has
+   * to the database location where the triggering write occurred. Has
    * full read and write access.
    */
-  get ref(): firebase.database.Reference {
+  get ref(): database.Reference {
     if (!this.app) {
       // may be unpopulated in user's unit tests
       throw new Error(
-        'Please supply a Firebase app in the constructor for DataSnapshot' +
-          ' in order to use the .ref method.'
+        "Please supply a Firebase app in the constructor for DataSnapshot" +
+          " in order to use the .ref method."
       );
     }
     if (!this._ref) {
-      this._ref = this.app.database(this.instance).ref(this._fullPath());
+      let db: database.Database;
+      if (this.instance) {
+        db = database.getDatabaseWithUrl(this.instance, this.app);
+      } else {
+        db = database.getDatabase(this.app);
+      }
+      this._ref = db.ref(this._fullPath());
     }
     return this._ref;
   }
@@ -87,14 +96,15 @@ export class DataSnapshot {
   /**
    * The key (last part of the path) of the location of this `DataSnapshot`.
    *
-   * The last token in a Database location is considered its key. For example,
+   * The last token in a database location is considered its key. For example,
    * "ada" is the key for the `/users/ada/` node. Accessing the key on any
-   * `DataSnapshot` will return the key for the location that generated it.
-   * However, accessing the key on the root URL of a Database will return `null`.
+   * `DataSnapshot` returns the key for the location that generated it.
+   * However, accessing the key on the root URL of a database returns `null`.
    */
-  get key(): string {
-    const last = _.last(pathParts(this._fullPath()));
-    return !last || last === '' ? null : last;
+  get key(): string | null {
+    const segments = pathParts(this._fullPath());
+    const last = segments[segments.length - 1];
+    return !last || last === "" ? null : last;
   }
 
   /**
@@ -105,24 +115,25 @@ export class DataSnapshot {
    * return `null`, indicating that the `DataSnapshot` is empty (contains no
    * data).
    *
-   * @return The DataSnapshot's contents as a JavaScript value (Object,
+   * @return The snapshot's contents as a JavaScript value (Object,
    *   Array, string, number, boolean, or `null`).
    */
   val(): any {
     const parts = pathParts(this._childPath);
-    const source = this._data;
-    const node = _.cloneDeep(
-      parts.length ? _.get(source, parts, null) : source
-    );
+    let source = this._data;
+    if (parts.length) {
+      for (const part of parts) {
+        source = source[part];
+      }
+    }
+    const node = source ?? null;
+
     return this._checkAndConvertToArray(node);
   }
 
   /**
    * Exports the entire contents of the `DataSnapshot` as a JavaScript object.
    *
-   * The `exportVal()` method is similar to `val()`, except priority information
-   * is included (if available), making it suitable for backing up your data.
-   *
    * @return The contents of the `DataSnapshot` as a JavaScript value
    *   (Object, Array, string, number, boolean, or `null`).
    */
@@ -150,7 +161,14 @@ export class DataSnapshot {
    * @return `true` if this `DataSnapshot` contains any data; otherwise, `false`.
    */
   exists(): boolean {
-    return !_.isNull(this.val());
+    const val = this.val();
+    if (!val || val === null) {
+      return false;
+    }
+    if (typeof val === "object" && Object.keys(val).length === 0) {
+      return false;
+    }
+    return true;
   }
 
   /**
@@ -177,25 +195,22 @@ export class DataSnapshot {
    * JavaScript object returned by `val()` is not guaranteed to match the ordering
    * on the server nor the ordering of `child_added` events. That is where
    * `forEach()` comes in handy. It guarantees the children of a `DataSnapshot`
-   * will be iterated in their query order.
+   * can be iterated in their query order.
    *
    * If no explicit `orderBy*()` method is used, results are returned
    * ordered by key (unless priorities are used, in which case, results are
    * returned by priority).
    *
-   * @param action A function that will be called for each child `DataSnapshot`.
+   * @param action A function that is called for each child `DataSnapshot`.
    *   The callback can return `true` to cancel further enumeration.
    *
    * @return `true` if enumeration was canceled due to your callback
    *   returning `true`.
    */
   forEach(action: (a: DataSnapshot) => boolean | void): boolean {
-    const val = this.val();
-    if (_.isPlainObject(val)) {
-      return _.some(
-        val,
-        (value, key: string) => action(this.child(key)) === true
-      );
+    const val = this.val() || {};
+    if (typeof val === "object") {
+      return Object.keys(val).some((key) => action(this.child(key)) === true);
     }
     return false;
   }
@@ -218,14 +233,14 @@ export class DataSnapshot {
    * You can use `hasChildren()` to determine if a `DataSnapshot` has any
    * children. If it does, you can enumerate them using `forEach()`. If it
    * doesn't, then either this snapshot contains a primitive value (which can be
-   * retrieved with `val()`) or it is empty (in which case, `val()` will return
+   * retrieved with `val()`) or it is empty (in which case, `val()` returns
    * `null`).
    *
    * @return `true` if this snapshot has any children; else `false`.
    */
   hasChildren(): boolean {
     const val = this.val();
-    return _.isPlainObject(val) && _.keys(val).length > 0;
+    return val !== null && typeof val === "object" && Object.keys(val).length > 0;
   }
 
   /**
@@ -235,7 +250,7 @@ export class DataSnapshot {
    */
   numChildren(): number {
     const val = this.val();
-    return _.isPlainObject(val) ? Object.keys(val).length : 0;
+    return val !== null && typeof val === "object" ? Object.keys(val).length : 0;
   }
 
   /**
@@ -243,7 +258,7 @@ export class DataSnapshot {
    *
    * @return A JSON-serializable representation of this object.
    */
-  toJSON(): Object {
+  toJSON(): Record<string, unknown> {
     return this.val();
   }
 
@@ -252,10 +267,10 @@ export class DataSnapshot {
    * @hidden
    */
   private _checkAndConvertToArray(node: any): any {
-    if (node === null || typeof node === 'undefined') {
+    if (node === null || typeof node === "undefined") {
       return null;
     }
-    if (typeof node !== 'object') {
+    if (typeof node !== "object") {
       return node;
     }
     const obj: any = {};
@@ -267,7 +282,12 @@ export class DataSnapshot {
         continue;
       }
       const childNode = node[key];
-      obj[key] = this._checkAndConvertToArray(childNode);
+      const v = this._checkAndConvertToArray(childNode);
+      if (v === null) {
+        // Empty child node
+        continue;
+      }
+      obj[key] = v;
       numKeys++;
       const integerRegExp = /^(0|[1-9]\d*)$/;
       if (allIntegerKeys && integerRegExp.test(key)) {
@@ -277,12 +297,17 @@ export class DataSnapshot {
       }
     }
 
+    if (numKeys === 0) {
+      // Empty node
+      return null;
+    }
+
     if (allIntegerKeys && maxKey < 2 * numKeys) {
       // convert to array.
       const array: any = [];
-      _.forOwn(obj, (val, key) => {
-        array[key] = val;
-      });
+      for (const key of Object.keys(obj)) {
+        array[key] = obj[key];
+      }
 
       return array;
     }
@@ -291,12 +316,7 @@ export class DataSnapshot {
 
   /** @hidden */
   private _dup(childPath?: string): DataSnapshot {
-    const dup = new DataSnapshot(
-      this._data,
-      undefined,
-      this.app,
-      this.instance
-    );
+    const dup = new DataSnapshot(this._data, undefined, this.app, this.instance);
     [dup._path, dup._childPath] = [this._path, this._childPath];
 
     if (childPath) {
@@ -308,7 +328,6 @@ export class DataSnapshot {
 
   /** @hidden */
   private _fullPath(): string {
-    const out = (this._path || '') + '/' + (this._childPath || '');
-    return out;
+    return (this._path || "") + "/" + (this._childPath || "");
   }
 }
diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts
index b3bed0e6d..cfa0aadec 100644
--- a/src/common/providers/https.ts
+++ b/src/common/providers/https.ts
@@ -20,80 +20,28 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as cors from 'cors';
-import * as express from 'express';
-import * as firebase from 'firebase-admin';
+import * as cors from "cors";
+import * as express from "express";
+import { DecodedAppCheckToken } from "firebase-admin/app-check";
 
-import * as logger from '../../logger';
+import * as logger from "../../logger";
 
 // TODO(inlined): Decide whether we want to un-version apps or whether we want a
 // different strategy
-import { apps } from '../../apps';
-import { isDebugFeatureEnabled } from '../debug';
-import { TaskContext } from './tasks';
+import { getAppCheck } from "firebase-admin/app-check";
+import { DecodedIdToken, getAuth } from "firebase-admin/auth";
+import { getApp } from "../app";
+import { isDebugFeatureEnabled } from "../debug";
+import { TaskContext } from "./tasks";
 
 const JWT_REGEX = /^[a-zA-Z0-9\-_=]+?\.[a-zA-Z0-9\-_=]+?\.([a-zA-Z0-9\-_=]+)?$/;
 
-/** @hidden */
+/** An express request with the wire format representation of the request body. */
 export interface Request extends express.Request {
   /** The wire format representation of the request body. */
   rawBody: Buffer;
 }
 
-// This is actually a firebase.appCheck.DecodedAppCheckToken, but
-// that type may not be available in some supported SDK versions.
-// Declare as an inline type, which DecodedAppCheckToken will be
-// able to merge with.
-// TODO: Replace with the real type once we bump the min-version of
-// the admin SDK
-interface DecodedAppCheckToken {
-  /**
-   * The issuer identifier for the issuer of the response.
-   *
-   * This value is a URL with the format
-   * `https://firebaseappcheck.googleapis.com/<PROJECT_NUMBER>`, where `<PROJECT_NUMBER>` is the
-   * same project number specified in the [`aud`](#aud) property.
-   */
-  iss: string;
-
-  /**
-   * The Firebase App ID corresponding to the app the token belonged to.
-   *
-   * As a convenience, this value is copied over to the [`app_id`](#app_id) property.
-   */
-  sub: string;
-
-  /**
-   * The audience for which this token is intended.
-   *
-   * This value is a JSON array of two strings, the first is the project number of your
-   * Firebase project, and the second is the project ID of the same project.
-   */
-  aud: string[];
-
-  /**
-   * The App Check token's expiration time, in seconds since the Unix epoch. That is, the
-   * time at which this App Check token expires and should no longer be considered valid.
-   */
-  exp: number;
-
-  /**
-   * The App Check token's issued-at time, in seconds since the Unix epoch. That is, the
-   * time at which this App Check token was issued and should start to be considered
-   * valid.;
-   */
-  iat: number;
-
-  /**
-   * The App ID corresponding to the App the App Check token belonged to.
-   *
-   * This value is not actually one of the JWT token claims. It is added as a
-   * convenience, and is set as the value of the [`sub`](#sub) property.
-   */
-  app_id: string;
-  [key: string]: any;
-}
-
 /**
  * The interface for AppCheck tokens verified in Callable functions
  */
@@ -107,7 +55,7 @@ export interface AppCheckData {
  */
 export interface AuthData {
   uid: string;
-  token: firebase.auth.DecodedIdToken;
+  token: DecodedIdToken;
 }
 
 // This type is the direct v1 callable interface and is also an interface
@@ -173,9 +121,9 @@ export interface CallableRequest<T = any> {
 
 /**
  * The set of Firebase Functions status codes. The codes are the same at the
- * ones exposed by gRPC here:
- * https://github.com/grpc/grpc/blob/master/doc/statuscodes.md
+ * ones exposed by {@link https://github.com/grpc/grpc/blob/master/doc/statuscodes.md | gRPC}.
  *
+ * @remarks
  * Possible values:
  *
  * - `cancelled`: The operation was cancelled (typically by the caller).
@@ -227,43 +175,43 @@ export interface CallableRequest<T = any> {
  *   credentials for the operation.
  */
 export type FunctionsErrorCode =
-  | 'ok'
-  | 'cancelled'
-  | 'unknown'
-  | 'invalid-argument'
-  | 'deadline-exceeded'
-  | 'not-found'
-  | 'already-exists'
-  | 'permission-denied'
-  | 'resource-exhausted'
-  | 'failed-precondition'
-  | 'aborted'
-  | 'out-of-range'
-  | 'unimplemented'
-  | 'internal'
-  | 'unavailable'
-  | 'data-loss'
-  | 'unauthenticated';
+  | "ok"
+  | "cancelled"
+  | "unknown"
+  | "invalid-argument"
+  | "deadline-exceeded"
+  | "not-found"
+  | "already-exists"
+  | "permission-denied"
+  | "resource-exhausted"
+  | "failed-precondition"
+  | "aborted"
+  | "out-of-range"
+  | "unimplemented"
+  | "internal"
+  | "unavailable"
+  | "data-loss"
+  | "unauthenticated";
 
 /** @hidden */
 export type CanonicalErrorCodeName =
-  | 'OK'
-  | 'CANCELLED'
-  | 'UNKNOWN'
-  | 'INVALID_ARGUMENT'
-  | 'DEADLINE_EXCEEDED'
-  | 'NOT_FOUND'
-  | 'ALREADY_EXISTS'
-  | 'PERMISSION_DENIED'
-  | 'UNAUTHENTICATED'
-  | 'RESOURCE_EXHAUSTED'
-  | 'FAILED_PRECONDITION'
-  | 'ABORTED'
-  | 'OUT_OF_RANGE'
-  | 'UNIMPLEMENTED'
-  | 'INTERNAL'
-  | 'UNAVAILABLE'
-  | 'DATA_LOSS';
+  | "OK"
+  | "CANCELLED"
+  | "UNKNOWN"
+  | "INVALID_ARGUMENT"
+  | "DEADLINE_EXCEEDED"
+  | "NOT_FOUND"
+  | "ALREADY_EXISTS"
+  | "PERMISSION_DENIED"
+  | "UNAUTHENTICATED"
+  | "RESOURCE_EXHAUSTED"
+  | "FAILED_PRECONDITION"
+  | "ABORTED"
+  | "OUT_OF_RANGE"
+  | "UNIMPLEMENTED"
+  | "INTERNAL"
+  | "UNAVAILABLE"
+  | "DATA_LOSS";
 
 /** @hidden */
 interface HttpErrorCode {
@@ -281,23 +229,23 @@ interface HttpErrorCode {
  * supported set.
  */
 const errorCodeMap: { [name in FunctionsErrorCode]: HttpErrorCode } = {
-  ok: { canonicalName: 'OK', status: 200 },
-  cancelled: { canonicalName: 'CANCELLED', status: 499 },
-  unknown: { canonicalName: 'UNKNOWN', status: 500 },
-  'invalid-argument': { canonicalName: 'INVALID_ARGUMENT', status: 400 },
-  'deadline-exceeded': { canonicalName: 'DEADLINE_EXCEEDED', status: 504 },
-  'not-found': { canonicalName: 'NOT_FOUND', status: 404 },
-  'already-exists': { canonicalName: 'ALREADY_EXISTS', status: 409 },
-  'permission-denied': { canonicalName: 'PERMISSION_DENIED', status: 403 },
-  unauthenticated: { canonicalName: 'UNAUTHENTICATED', status: 401 },
-  'resource-exhausted': { canonicalName: 'RESOURCE_EXHAUSTED', status: 429 },
-  'failed-precondition': { canonicalName: 'FAILED_PRECONDITION', status: 400 },
-  aborted: { canonicalName: 'ABORTED', status: 409 },
-  'out-of-range': { canonicalName: 'OUT_OF_RANGE', status: 400 },
-  unimplemented: { canonicalName: 'UNIMPLEMENTED', status: 501 },
-  internal: { canonicalName: 'INTERNAL', status: 500 },
-  unavailable: { canonicalName: 'UNAVAILABLE', status: 503 },
-  'data-loss': { canonicalName: 'DATA_LOSS', status: 500 },
+  ok: { canonicalName: "OK", status: 200 },
+  cancelled: { canonicalName: "CANCELLED", status: 499 },
+  unknown: { canonicalName: "UNKNOWN", status: 500 },
+  "invalid-argument": { canonicalName: "INVALID_ARGUMENT", status: 400 },
+  "deadline-exceeded": { canonicalName: "DEADLINE_EXCEEDED", status: 504 },
+  "not-found": { canonicalName: "NOT_FOUND", status: 404 },
+  "already-exists": { canonicalName: "ALREADY_EXISTS", status: 409 },
+  "permission-denied": { canonicalName: "PERMISSION_DENIED", status: 403 },
+  unauthenticated: { canonicalName: "UNAUTHENTICATED", status: 401 },
+  "resource-exhausted": { canonicalName: "RESOURCE_EXHAUSTED", status: 429 },
+  "failed-precondition": { canonicalName: "FAILED_PRECONDITION", status: 400 },
+  aborted: { canonicalName: "ABORTED", status: 409 },
+  "out-of-range": { canonicalName: "OUT_OF_RANGE", status: 400 },
+  unimplemented: { canonicalName: "UNIMPLEMENTED", status: 501 },
+  internal: { canonicalName: "INTERNAL", status: 500 },
+  unavailable: { canonicalName: "UNAVAILABLE", status: 503 },
+  "data-loss": { canonicalName: "DATA_LOSS", status: 500 },
 };
 
 /** @hidden */
@@ -381,49 +329,49 @@ interface HttpResponseBody {
 export function isValidRequest(req: Request): req is HttpRequest {
   // The body must not be empty.
   if (!req.body) {
-    logger.warn('Request is missing body.');
+    logger.warn("Request is missing body.");
     return false;
   }
 
   // Make sure it's a POST.
-  if (req.method !== 'POST') {
-    logger.warn('Request has invalid method.', req.method);
+  if (req.method !== "POST") {
+    logger.warn("Request has invalid method.", req.method);
     return false;
   }
 
   // Check that the Content-Type is JSON.
-  let contentType = (req.header('Content-Type') || '').toLowerCase();
+  let contentType = (req.header("Content-Type") || "").toLowerCase();
   // If it has a charset, just ignore it for now.
-  const semiColon = contentType.indexOf(';');
+  const semiColon = contentType.indexOf(";");
   if (semiColon >= 0) {
     contentType = contentType.slice(0, semiColon).trim();
   }
-  if (contentType !== 'application/json') {
-    logger.warn('Request has incorrect Content-Type.', contentType);
+  if (contentType !== "application/json") {
+    logger.warn("Request has incorrect Content-Type.", contentType);
     return false;
   }
 
   // The body must have data.
-  if (typeof req.body.data === 'undefined') {
-    logger.warn('Request body is missing data.', req.body);
+  if (typeof req.body.data === "undefined") {
+    logger.warn("Request body is missing data.", req.body);
     return false;
   }
 
   // TODO(klimt): Allow only specific http headers.
 
   // Verify that the body does not have any extra fields.
-  const extraKeys = Object.keys(req.body).filter((field) => field !== 'data');
+  const extraKeys = Object.keys(req.body).filter((field) => field !== "data");
   if (extraKeys.length !== 0) {
-    logger.warn('Request body has extra fields: ', extraKeys.join(', '));
+    logger.warn("Request body has extra fields: ", extraKeys.join(", "));
     return false;
   }
   return true;
 }
 
 /** @hidden */
-const LONG_TYPE = 'type.googleapis.com/google.protobuf.Int64Value';
+const LONG_TYPE = "type.googleapis.com/google.protobuf.Int64Value";
 /** @hidden */
-const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value';
+const UNSIGNED_LONG_TYPE = "type.googleapis.com/google.protobuf.UInt64Value";
 
 /**
  * Encodes arbitrary data in our special format for JSON.
@@ -431,7 +379,7 @@ const UNSIGNED_LONG_TYPE = 'type.googleapis.com/google.protobuf.UInt64Value';
  */
 /** @hidden */
 export function encode(data: any): any {
-  if (data === null || typeof data === 'undefined') {
+  if (data === null || typeof data === "undefined") {
     return null;
   }
   if (data instanceof Number) {
@@ -442,16 +390,16 @@ export function encode(data: any): any {
     // without any loss of precision.
     return data;
   }
-  if (typeof data === 'boolean') {
+  if (typeof data === "boolean") {
     return data;
   }
-  if (typeof data === 'string') {
+  if (typeof data === "string") {
     return data;
   }
   if (Array.isArray(data)) {
     return data.map(encode);
   }
-  if (typeof data === 'object' || typeof data === 'function') {
+  if (typeof data === "object" || typeof data === "function") {
     // Sadly we don't have Object.fromEntries in Node 10, so we can't use a single
     // list comprehension
     const obj: Record<string, any> = {};
@@ -461,8 +409,8 @@ export function encode(data: any): any {
     return obj;
   }
   // If we got this far, the data is not encodable.
-  logger.error('Data cannot be encoded in JSON.', data);
-  throw new Error('Data cannot be encoded in JSON: ' + data);
+  logger.error("Data cannot be encoded in JSON.", data);
+  throw new Error(`Data cannot be encoded in JSON: ${data}`);
 }
 
 /**
@@ -474,8 +422,8 @@ export function decode(data: any): any {
   if (data === null) {
     return data;
   }
-  if (data['@type']) {
-    switch (data['@type']) {
+  if (data["@type"]) {
+    switch (data["@type"]) {
       case LONG_TYPE:
       // Fall through and handle this the same as unsigned.
       case UNSIGNED_LONG_TYPE: {
@@ -484,21 +432,21 @@ export function decode(data: any): any {
         // worth all the extra code to detect that case.
         const value = parseFloat(data.value);
         if (isNaN(value)) {
-          logger.error('Data cannot be decoded from JSON.', data);
-          throw new Error('Data cannot be decoded from JSON: ' + data);
+          logger.error("Data cannot be decoded from JSON.", data);
+          throw new Error(`Data cannot be decoded from JSON: ${data}`);
         }
         return value;
       }
       default: {
-        logger.error('Data cannot be decoded from JSON.', data);
-        throw new Error('Data cannot be decoded from JSON: ' + data);
+        logger.error("Data cannot be decoded from JSON.", data);
+        throw new Error(`Data cannot be decoded from JSON: ${data}`);
       }
     }
   }
   if (Array.isArray(data)) {
     return data.map(decode);
   }
-  if (typeof data === 'object') {
+  if (typeof data === "object") {
     const obj: Record<string, any> = {};
     for (const [k, v] of Object.entries(data)) {
       obj[k] = decode(v);
@@ -517,7 +465,7 @@ export function decode(data: any): any {
  *
  */
 /** @hidden */
-type TokenStatus = 'MISSING' | 'VALID' | 'INVALID';
+type TokenStatus = "MISSING" | "VALID" | "INVALID";
 
 /** @hidden */
 interface CallableTokenStatus {
@@ -530,17 +478,17 @@ export function unsafeDecodeToken(token: string): unknown {
   if (!JWT_REGEX.test(token)) {
     return {};
   }
-  const components = token
-    .split('.')
-    .map((s) => Buffer.from(s, 'base64').toString());
+  const components = token.split(".").map((s) => Buffer.from(s, "base64").toString());
   let payload = components[1];
-  if (typeof payload === 'string') {
+  if (typeof payload === "string") {
     try {
       const obj = JSON.parse(payload);
-      if (typeof obj === 'object') {
+      if (typeof obj === "object") {
         payload = obj;
       }
-    } catch (e) {}
+    } catch (e) {
+      // ignore error
+    }
   }
   return payload;
 }
@@ -553,10 +501,8 @@ export function unsafeDecodeToken(token: string): unknown {
  * This is exposed only for testing.
  */
 /** @internal */
-export function unsafeDecodeIdToken(
-  token: string
-): firebase.auth.DecodedIdToken {
-  const decoded = unsafeDecodeToken(token) as firebase.auth.DecodedIdToken;
+export function unsafeDecodeIdToken(token: string): DecodedIdToken {
+  const decoded = unsafeDecodeToken(token) as DecodedIdToken;
   decoded.uid = decoded.sub;
   return decoded;
 }
@@ -581,16 +527,13 @@ export function unsafeDecodeAppCheckToken(token: string): DecodedAppCheckToken {
  *
  * @param {Request} req - Request sent to the Callable function.
  * @param {CallableContext} ctx - Context to be sent to callable function handler.
- * @return {CallableTokenStatus} Status of the token verifications.
+ * @returns {CallableTokenStatus} Status of the token verifications.
  */
 /** @internal */
-async function checkTokens(
-  req: Request,
-  ctx: CallableContext
-): Promise<CallableTokenStatus> {
+async function checkTokens(req: Request, ctx: CallableContext): Promise<CallableTokenStatus> {
   const verifications: CallableTokenStatus = {
-    app: 'INVALID',
-    auth: 'INVALID',
+    app: "INVALID",
+    auth: "INVALID",
   };
 
   await Promise.all([
@@ -604,26 +547,23 @@ async function checkTokens(
 
   const logPayload = {
     verifications,
-    'logging.googleapis.com/labels': {
-      'firebase-log-type': 'callable-request-verification',
+    "logging.googleapis.com/labels": {
+      "firebase-log-type": "callable-request-verification",
     },
   };
 
   const errs = [];
-  if (verifications.app === 'INVALID') {
-    errs.push('AppCheck token was rejected.');
+  if (verifications.app === "INVALID") {
+    errs.push("AppCheck token was rejected.");
   }
-  if (verifications.auth === 'INVALID') {
-    errs.push('Auth token was rejected.');
+  if (verifications.auth === "INVALID") {
+    errs.push("Auth token was rejected.");
   }
 
-  if (errs.length == 0) {
-    logger.info('Callable request verification passed', logPayload);
+  if (errs.length === 0) {
+    logger.debug("Callable request verification passed", logPayload);
   } else {
-    logger.warn(
-      `Callable request verification failed: ${errs.join(' ')}`,
-      logPayload
-    );
+    logger.warn(`Callable request verification failed: ${errs.join(" ")}`, logPayload);
   }
 
   return verifications;
@@ -634,76 +574,62 @@ export async function checkAuthToken(
   req: Request,
   ctx: CallableContext | TaskContext
 ): Promise<TokenStatus> {
-  const authorization = req.header('Authorization');
+  const authorization = req.header("Authorization");
   if (!authorization) {
-    return 'MISSING';
+    return "MISSING";
   }
-  const match = authorization.match(/^Bearer (.*)$/);
-  if (match) {
-    const idToken = match[1];
-    try {
-      let authToken: firebase.auth.DecodedIdToken;
-      if (isDebugFeatureEnabled('skipTokenVerification')) {
-        authToken = unsafeDecodeIdToken(idToken);
-      } else {
-        authToken = await apps()
-          .admin.auth()
-          .verifyIdToken(idToken);
-      }
-      ctx.auth = {
-        uid: authToken.uid,
-        token: authToken,
-      };
-      return 'VALID';
-    } catch (err) {
-      logger.warn('Failed to validate auth token.', err);
-      return 'INVALID';
+  const match = authorization.match(/^Bearer (.*)$/i);
+  if (!match) {
+    return "INVALID";
+  }
+  const idToken = match[1];
+  try {
+    let authToken: DecodedIdToken;
+    if (isDebugFeatureEnabled("skipTokenVerification")) {
+      authToken = unsafeDecodeIdToken(idToken);
+    } else {
+      authToken = await getAuth(getApp()).verifyIdToken(idToken);
     }
+    ctx.auth = {
+      uid: authToken.uid,
+      token: authToken,
+    };
+    return "VALID";
+  } catch (err) {
+    logger.warn("Failed to validate auth token.", err);
+    return "INVALID";
   }
 }
 
 /** @internal */
-async function checkAppCheckToken(
-  req: Request,
-  ctx: CallableContext
-): Promise<TokenStatus> {
-  const appCheck = req.header('X-Firebase-AppCheck');
+async function checkAppCheckToken(req: Request, ctx: CallableContext): Promise<TokenStatus> {
+  const appCheck = req.header("X-Firebase-AppCheck");
   if (!appCheck) {
-    return 'MISSING';
+    return "MISSING";
   }
   try {
-    if (!apps().admin.appCheck) {
-      throw new Error(
-        'Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0'
-      );
-    }
     let appCheckData;
-    if (isDebugFeatureEnabled('skipTokenVerification')) {
+    if (isDebugFeatureEnabled("skipTokenVerification")) {
       const decodedToken = unsafeDecodeAppCheckToken(appCheck);
       appCheckData = { appId: decodedToken.app_id, token: decodedToken };
     } else {
-      appCheckData = await apps()
-        .admin.appCheck()
-        .verifyToken(appCheck);
+      appCheckData = await getAppCheck(getApp()).verifyToken(appCheck);
     }
     ctx.app = appCheckData;
-    return 'VALID';
+    return "VALID";
   } catch (err) {
-    logger.warn('Failed to validate AppCheck token.', err);
-    return 'INVALID';
+    logger.warn("Failed to validate AppCheck token.", err);
+    return "INVALID";
   }
 }
 
-type v1CallableHandler = (
-  data: any,
-  context: CallableContext
-) => any | Promise<any>;
+type v1CallableHandler = (data: any, context: CallableContext) => any | Promise<any>;
 type v2CallableHandler<Req, Res> = (request: CallableRequest<Req>) => Res;
 
 /** @internal **/
 export interface CallableOptions {
   cors: cors.CorsOptions;
-  allowInvalidAppCheckToken?: boolean;
+  enforceAppCheck?: boolean;
 }
 
 /** @internal */
@@ -714,7 +640,7 @@ export function onCallHandler<Req = any, Res = any>(
   const wrapped = wrapOnCallHandler(options, handler);
   return (req: Request, res: express.Response) => {
     return new Promise((resolve) => {
-      res.on('finish', resolve);
+      res.on("finish", resolve);
       cors(options.cors)(req, res, () => {
         resolve(wrapped(req, res));
       });
@@ -730,26 +656,35 @@ function wrapOnCallHandler<Req = any, Res = any>(
   return async (req: Request, res: express.Response): Promise<void> => {
     try {
       if (!isValidRequest(req)) {
-        logger.error('Invalid request, unable to process.');
-        throw new HttpsError('invalid-argument', 'Bad Request');
+        logger.error("Invalid request, unable to process.");
+        throw new HttpsError("invalid-argument", "Bad Request");
       }
 
       const context: CallableContext = { rawRequest: req };
       const tokenStatus = await checkTokens(req, context);
-      if (tokenStatus.auth === 'INVALID') {
-        throw new HttpsError('unauthenticated', 'Unauthenticated');
+      if (tokenStatus.auth === "INVALID") {
+        throw new HttpsError("unauthenticated", "Unauthenticated");
+      }
+      if (tokenStatus.app === "INVALID") {
+        if (options.enforceAppCheck) {
+          throw new HttpsError("unauthenticated", "Unauthenticated");
+        } else {
+          logger.warn(
+            "Allowing request with invalid AppCheck token because enforcement is disabled"
+          );
+        }
       }
-      if (tokenStatus.app === 'INVALID' && !options.allowInvalidAppCheckToken) {
-        throw new HttpsError('unauthenticated', 'Unauthenticated');
+      if (tokenStatus.app === "MISSING" && options.enforceAppCheck) {
+        throw new HttpsError("unauthenticated", "Unauthenticated");
       }
 
-      const instanceId = req.header('Firebase-Instance-ID-Token');
+      const instanceId = req.header("Firebase-Instance-ID-Token");
       if (instanceId) {
         // Validating the token requires an http request, so we don't do it.
         // If the user wants to use it for something, it will be validated then.
         // Currently, the only real use case for this token is for sending
         // pushes with FCM. In that case, the FCM APIs will validate the token.
-        context.instanceIdToken = req.header('Firebase-Instance-ID-Token');
+        context.instanceIdToken = req.header("Firebase-Instance-ID-Token");
       }
 
       const data: Req = decode(req.body.data);
@@ -773,14 +708,15 @@ function wrapOnCallHandler<Req = any, Res = any>(
       const responseBody: HttpResponseBody = { result };
       res.status(200).send(responseBody);
     } catch (err) {
+      let httpErr = err;
       if (!(err instanceof HttpsError)) {
         // This doesn't count as an 'explicit' error.
-        logger.error('Unhandled error', err);
-        err = new HttpsError('internal', 'INTERNAL');
+        logger.error("Unhandled error", err);
+        httpErr = new HttpsError("internal", "INTERNAL");
       }
 
-      const { status } = err.httpErrorCode;
-      const body = { error: err.toJSON() };
+      const { status } = httpErr.httpErrorCode;
+      const body = { error: httpErr.toJSON() };
 
       res.status(status).send(body);
     }
diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts
index 0a376be9e..9997d7569 100644
--- a/src/common/providers/identity.ts
+++ b/src/common/providers/identity.ts
@@ -20,32 +20,32 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
-import * as firebase from 'firebase-admin';
-import { logger } from '../..';
-import { apps } from '../../apps';
-import { EventContext } from '../../cloud-functions';
-import { isDebugFeatureEnabled } from '../debug';
-import { HttpsError, unsafeDecodeToken } from './https';
+import * as express from "express";
+import * as auth from "firebase-admin/auth";
+import * as logger from "../../logger";
+import { EventContext } from "../../v1/cloud-functions";
+import { getApp } from "../app";
+import { isDebugFeatureEnabled } from "../debug";
+import { HttpsError, unsafeDecodeToken } from "./https";
 
 export { HttpsError };
 
 const DISALLOWED_CUSTOM_CLAIMS = [
-  'acr',
-  'amr',
-  'at_hash',
-  'aud',
-  'auth_time',
-  'azp',
-  'cnf',
-  'c_hash',
-  'exp',
-  'iat',
-  'iss',
-  'jti',
-  'nbf',
-  'nonce',
-  'firebase',
+  "acr",
+  "amr",
+  "at_hash",
+  "aud",
+  "auth_time",
+  "azp",
+  "cnf",
+  "c_hash",
+  "exp",
+  "iat",
+  "iss",
+  "jti",
+  "nbf",
+  "nonce",
+  "firebase",
 ];
 
 const CLAIMS_MAX_PAYLOAD_SIZE = 1000;
@@ -55,28 +55,28 @@ const CLAIMS_MAX_PAYLOAD_SIZE = 1000;
  * @hidden
  * @alpha
  */
-export type AuthBlockingEventType = 'beforeCreate' | 'beforeSignIn';
+export type AuthBlockingEventType = "beforeCreate" | "beforeSignIn";
 
 const EVENT_MAPPING: Record<string, string> = {
-  beforeCreate: 'providers/cloud.auth/eventTypes/user.beforeCreate',
-  beforeSignIn: 'providers/cloud.auth/eventTypes/user.beforeSignIn',
+  beforeCreate: "providers/cloud.auth/eventTypes/user.beforeCreate",
+  beforeSignIn: "providers/cloud.auth/eventTypes/user.beforeSignIn",
 };
 
 /**
  * The UserRecord passed to Cloud Functions is the same UserRecord that is returned by the Firebase Admin
  * SDK.
  */
-export type UserRecord = firebase.auth.UserRecord;
+export type UserRecord = auth.UserRecord;
 
 /**
  * UserInfo that is part of the UserRecord
  */
-export type UserInfo = firebase.auth.UserInfo;
+export type UserInfo = auth.UserInfo;
 
 /**
  * Helper class to create the user metadata in a UserRecord object
  */
-export class UserRecordMetadata implements firebase.auth.UserMetadata {
+export class UserRecordMetadata implements auth.UserMetadata {
   constructor(public creationTime: string, public lastSignInTime: string) {}
 
   /** Returns a plain JavaScript object with the properties of UserRecordMetadata. */
@@ -93,7 +93,7 @@ export class UserRecordMetadata implements firebase.auth.UserMetadata {
  * @param wireData data sent over the wire
  * @returns an instance of UserRecord with correct toJSON functions
  */
-export function userRecordConstructor(wireData: Object): UserRecord {
+export function userRecordConstructor(wireData: Record<string, unknown>): UserRecord {
   // Falsey values from the wire format proto get lost when converted to JSON, this adds them back.
   const falseyValues: any = {
     email: null,
@@ -452,19 +452,19 @@ type HandlerV2 = (
  * @internal
  */
 export function isValidRequest(req: express.Request): boolean {
-  if (req.method !== 'POST') {
+  if (req.method !== "POST") {
     logger.warn(`Request has invalid method "${req.method}".`);
     return false;
   }
 
-  const contentType: string = (req.header('Content-Type') || '').toLowerCase();
-  if (!contentType.includes('application/json')) {
-    logger.warn('Request has invalid header Content-Type.');
+  const contentType: string = (req.header("Content-Type") || "").toLowerCase();
+  if (!contentType.includes("application/json")) {
+    logger.warn("Request has invalid header Content-Type.");
     return false;
   }
 
   if (!req.body?.data?.jwt) {
-    logger.warn('Request has an invalid body.');
+    logger.warn("Request has an invalid body.");
     return false;
   }
   return true;
@@ -487,14 +487,12 @@ function unsafeDecodeAuthBlockingToken(token: string): DecodedPayload {
  * Helper function to parse the decoded metadata object into a UserMetaData object
  * @internal
  */
-export function parseMetadata(
-  metadata: DecodedPayloadUserRecordMetadata
-): AuthUserMetadata {
+export function parseMetadata(metadata: DecodedPayloadUserRecordMetadata): AuthUserMetadata {
   const creationTime = metadata?.creation_time
-    ? new Date((metadata.creation_time as number) * 1000).toUTCString()
+    ? new Date(metadata.creation_time * 1000).toUTCString()
     : null;
   const lastSignInTime = metadata?.last_sign_in_time
-    ? new Date((metadata.last_sign_in_time as number) * 1000).toUTCString()
+    ? new Date(metadata.last_sign_in_time * 1000).toUTCString()
     : null;
   return {
     creationTime,
@@ -537,7 +535,9 @@ export function parseDate(tokensValidAfterTime?: number): string | null {
     if (!isNaN(date.getTime())) {
       return date.toUTCString();
     }
-  } catch {}
+  } catch {
+    // ignore error
+  }
   return null;
 }
 
@@ -555,8 +555,8 @@ export function parseMultiFactor(
   for (const factor of multiFactor.enrolled_factors || []) {
     if (!factor.uid) {
       throw new HttpsError(
-        'internal',
-        'INTERNAL ASSERT FAILED: Invalid multi-factor info response'
+        "internal",
+        "INTERNAL ASSERT FAILED: Invalid multi-factor info response"
       );
     }
     const enrollmentTime = factor.enrollment_time
@@ -564,9 +564,7 @@ export function parseMultiFactor(
       : null;
     parsedEnrolledFactors.push({
       uid: factor.uid,
-      factorId: factor.phone_number
-        ? factor.factor_id || 'phone'
-        : factor.factor_id,
+      factorId: factor.phone_number ? factor.factor_id || "phone" : factor.factor_id,
       displayName: factor.display_name,
       enrollmentTime,
       phoneNumber: factor.phone_number,
@@ -589,18 +587,13 @@ export function parseAuthUserRecord(
   decodedJWTUserRecord: DecodedPayloadUserRecord
 ): AuthUserRecord {
   if (!decodedJWTUserRecord.uid) {
-    throw new HttpsError(
-      'internal',
-      'INTERNAL ASSERT FAILED: Invalid user response'
-    );
+    throw new HttpsError("internal", "INTERNAL ASSERT FAILED: Invalid user response");
   }
 
   const disabled = decodedJWTUserRecord.disabled || false;
   const metadata = parseMetadata(decodedJWTUserRecord.metadata);
   const providerData = parseProviderData(decodedJWTUserRecord.provider_data);
-  const tokensValidAfterTime = parseDate(
-    decodedJWTUserRecord.tokens_valid_after_time
-  );
+  const tokensValidAfterTime = parseDate(decodedJWTUserRecord.tokens_valid_after_time);
   const multiFactor = parseMultiFactor(decodedJWTUserRecord.multi_factor);
 
   return {
@@ -623,10 +616,9 @@ export function parseAuthUserRecord(
 }
 
 /** Helper to get the AdditionalUserInfo from the decoded jwt */
-function parseAdditionalUserInfo(
-  decodedJWT: DecodedPayload
-): AdditionalUserInfo {
-  let profile, username;
+function parseAdditionalUserInfo(decodedJWT: DecodedPayload): AdditionalUserInfo {
+  let profile;
+  let username;
   if (decodedJWT.raw_user_info) {
     try {
       profile = JSON.parse(decodedJWT.raw_user_info);
@@ -635,30 +627,24 @@ function parseAdditionalUserInfo(
     }
   }
   if (profile) {
-    if (decodedJWT.sign_in_method === 'github.com') {
+    if (decodedJWT.sign_in_method === "github.com") {
       username = profile.login;
     }
-    if (decodedJWT.sign_in_method === 'twitter.com') {
+    if (decodedJWT.sign_in_method === "twitter.com") {
       username = profile.screen_name;
     }
   }
 
   return {
-    providerId:
-      decodedJWT.sign_in_method === 'emailLink'
-        ? 'password'
-        : decodedJWT.sign_in_method,
+    providerId: decodedJWT.sign_in_method === "emailLink" ? "password" : decodedJWT.sign_in_method,
     profile,
     username,
-    isNewUser: decodedJWT.event_type === 'beforeCreate' ? true : false,
+    isNewUser: decodedJWT.event_type === "beforeCreate" ? true : false,
   };
 }
 
 /** Helper to get the Credential from the decoded jwt */
-function parseAuthCredential(
-  decodedJWT: DecodedPayload,
-  time: number
-): Credential {
+function parseAuthCredential(decodedJWT: DecodedPayload, time: number): Credential {
   if (
     !decodedJWT.sign_in_attributes &&
     !decodedJWT.oauth_id_token &&
@@ -676,10 +662,7 @@ function parseAuthCredential(
       ? new Date(time + decodedJWT.oauth_expires_in * 1000).toUTCString()
       : undefined,
     secret: decodedJWT.oauth_token_secret,
-    providerId:
-      decodedJWT.sign_in_method === 'emailLink'
-        ? 'password'
-        : decodedJWT.sign_in_method,
+    providerId: decodedJWT.sign_in_method === "emailLink" ? "password" : decodedJWT.sign_in_method,
     signInMethod: decodedJWT.sign_in_method,
   };
 }
@@ -695,7 +678,7 @@ export function parseAuthEventContext(
 ): AuthEventContext {
   const eventType =
     (EVENT_MAPPING[decodedJWT.event_type] || decodedJWT.event_type) +
-    (decodedJWT.sign_in_method ? `:${decodedJWT.sign_in_method}` : '');
+    (decodedJWT.sign_in_method ? `:${decodedJWT.sign_in_method}` : "");
 
   return {
     locale: decodedJWT.locale,
@@ -703,11 +686,11 @@ export function parseAuthEventContext(
     userAgent: decodedJWT.user_agent,
     eventId: decodedJWT.event_id,
     eventType,
-    authType: !!decodedJWT.user_record ? 'USER' : 'UNAUTHENTICATED',
+    authType: decodedJWT.user_record ? "USER" : "UNAUTHENTICATED",
     resource: {
       // TODO(colerogers): figure out the correct service
-      service: 'identitytoolkit.googleapis.com',
-      name: !!decodedJWT.tenant_id
+      service: "identitytoolkit.googleapis.com",
+      name: decodedJWT.tenant_id
         ? `projects/${projectId}/tenants/${decodedJWT.tenant_id}`
         : `projects/${projectId}`,
     },
@@ -735,42 +718,35 @@ export function validateAuthResponse(
     );
     if (invalidClaims.length > 0) {
       throw new HttpsError(
-        'invalid-argument',
-        `The customClaims claims "${invalidClaims.join(
-          ','
-        )}" are reserved and cannot be specified.`
+        "invalid-argument",
+        `The customClaims claims "${invalidClaims.join(",")}" are reserved and cannot be specified.`
       );
     }
-    if (
-      JSON.stringify(authRequest.customClaims).length > CLAIMS_MAX_PAYLOAD_SIZE
-    ) {
+    if (JSON.stringify(authRequest.customClaims).length > CLAIMS_MAX_PAYLOAD_SIZE) {
       throw new HttpsError(
-        'invalid-argument',
+        "invalid-argument",
         `The customClaims payload should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters.`
       );
     }
   }
-  if (
-    eventType === 'beforeSignIn' &&
-    (authRequest as BeforeSignInResponse).sessionClaims
-  ) {
+  if (eventType === "beforeSignIn" && (authRequest as BeforeSignInResponse).sessionClaims) {
     const invalidClaims = DISALLOWED_CUSTOM_CLAIMS.filter((claim) =>
       (authRequest as BeforeSignInResponse).sessionClaims.hasOwnProperty(claim)
     );
     if (invalidClaims.length > 0) {
       throw new HttpsError(
-        'invalid-argument',
+        "invalid-argument",
         `The sessionClaims claims "${invalidClaims.join(
-          ','
+          ","
         )}" are reserved and cannot be specified.`
       );
     }
     if (
-      JSON.stringify((authRequest as BeforeSignInResponse).sessionClaims)
-        .length > CLAIMS_MAX_PAYLOAD_SIZE
+      JSON.stringify((authRequest as BeforeSignInResponse).sessionClaims).length >
+      CLAIMS_MAX_PAYLOAD_SIZE
     ) {
       throw new HttpsError(
-        'invalid-argument',
+        "invalid-argument",
         `The sessionClaims payload should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters.`
       );
     }
@@ -780,7 +756,7 @@ export function validateAuthResponse(
     };
     if (JSON.stringify(combinedClaims).length > CLAIMS_MAX_PAYLOAD_SIZE) {
       throw new HttpsError(
-        'invalid-argument',
+        "invalid-argument",
         `The customClaims and sessionClaims payloads should not exceed ${CLAIMS_MAX_PAYLOAD_SIZE} characters combined.`
       );
     }
@@ -791,54 +767,40 @@ export function validateAuthResponse(
  * Helper function to generate the update mask for the identity platform changed values
  * @internal
  */
-export function getUpdateMask(
-  authResponse?: BeforeCreateResponse | BeforeSignInResponse
-): string {
+export function getUpdateMask(authResponse?: BeforeCreateResponse | BeforeSignInResponse): string {
   if (!authResponse) {
-    return '';
+    return "";
   }
   const updateMask: string[] = [];
   for (const key in authResponse) {
-    if (
-      authResponse.hasOwnProperty(key) &&
-      typeof authResponse[key] !== 'undefined'
-    ) {
+    if (authResponse.hasOwnProperty(key) && typeof authResponse[key] !== "undefined") {
       updateMask.push(key);
     }
   }
-  return updateMask.join(',');
+  return updateMask.join(",");
 }
 
 /** @internal */
-export function wrapHandler(
-  eventType: AuthBlockingEventType,
-  handler: HandlerV1 | HandlerV2
-) {
+export function wrapHandler(eventType: AuthBlockingEventType, handler: HandlerV1 | HandlerV2) {
   return async (req: express.Request, res: express.Response): Promise<void> => {
     try {
       const projectId = process.env.GCLOUD_PROJECT;
       if (!isValidRequest(req)) {
-        logger.error('Invalid request, unable to process');
-        throw new HttpsError('invalid-argument', 'Bad Request');
+        logger.error("Invalid request, unable to process");
+        throw new HttpsError("invalid-argument", "Bad Request");
       }
 
-      if (!apps().admin.auth()._verifyAuthBlockingToken) {
+      if (!auth.getAuth(getApp())._verifyAuthBlockingToken) {
         throw new Error(
-          'Cannot validate Auth Blocking token. Please update Firebase Admin SDK to >= v10.1.0'
+          "Cannot validate Auth Blocking token. Please update Firebase Admin SDK to >= v10.1.0"
         );
       }
 
-      const decodedPayload: DecodedPayload = isDebugFeatureEnabled(
-        'skipTokenVerification'
-      )
+      const decodedPayload: DecodedPayload = isDebugFeatureEnabled("skipTokenVerification")
         ? unsafeDecodeAuthBlockingToken(req.body.data.jwt)
         : handler.length === 2
-        ? await apps()
-            .admin.auth()
-            ._verifyAuthBlockingToken(req.body.data.jwt)
-        : await apps()
-            .admin.auth()
-            ._verifyAuthBlockingToken(req.body.data.jwt, 'run.app');
+        ? await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt)
+        : await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt, "run.app");
 
       const authUserRecord = parseAuthUserRecord(decodedPayload.user_record);
       const authEventContext = parseAuthEventContext(decodedPayload, projectId);
@@ -846,8 +808,7 @@ export function wrapHandler(
       let authResponse;
       if (handler.length === 2) {
         authResponse =
-          (await (handler as HandlerV1)(authUserRecord, authEventContext)) ||
-          undefined;
+          (await (handler as HandlerV1)(authUserRecord, authEventContext)) || undefined;
       } else {
         authResponse =
           (await (handler as HandlerV2)({
@@ -869,18 +830,19 @@ export function wrapHandler(
             };
 
       res.status(200);
-      res.setHeader('Content-Type', 'application/json');
+      res.setHeader("Content-Type", "application/json");
       res.send(JSON.stringify(result));
     } catch (err) {
-      if (!(err instanceof HttpsError)) {
+      let httpErr: HttpsError = err;
+      if (!(httpErr instanceof HttpsError)) {
         // This doesn't count as an 'explicit' error.
-        logger.error('Unhandled error', err);
-        err = new HttpsError('internal', 'An unexpected error occurred.');
+        logger.error("Unhandled error", err);
+        httpErr = new HttpsError("internal", "An unexpected error occurred.");
       }
 
-      const { status } = err.httpErrorCode;
-      const body = { error: err.toJSON() };
-      res.setHeader('Content-Type', 'application/json');
+      const { status } = httpErr.httpErrorCode;
+      const body = { error: httpErr.toJSON() };
+      res.setHeader("Content-Type", "application/json");
       res.status(status).send(body);
     }
   };
diff --git a/src/common/providers/tasks.ts b/src/common/providers/tasks.ts
index 814087f01..faf08448f 100644
--- a/src/common/providers/tasks.ts
+++ b/src/common/providers/tasks.ts
@@ -20,12 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
-import * as firebase from 'firebase-admin';
+import * as express from "express";
+import { DecodedIdToken } from "firebase-admin/auth";
 
-import * as logger from '../../logger';
-import { Expression } from '../../v2/params';
-import * as https from './https';
+import * as logger from "../../logger";
+import * as https from "./https";
+import { Expression } from "../../params";
+import { ResetValue } from "../options";
 
 /** How a task should be retried in the event of a non-2xx return. */
 export interface RetryConfig {
@@ -33,31 +34,31 @@ export interface RetryConfig {
    * Maximum number of times a request should be attempted.
    * If left unspecified, will default to 3.
    */
-  maxAttempts?: number | Expression<number> | null;
+  maxAttempts?: number | Expression<number> | ResetValue;
 
   /**
    * Maximum amount of time for retrying failed task.
    * If left unspecified will retry indefinitely.
    */
-  maxRetrySeconds?: number | Expression<number> | null;
+  maxRetrySeconds?: number | Expression<number> | ResetValue;
 
   /**
    * The maximum amount of time to wait between attempts.
    * If left unspecified will default to 1hr.
    */
-  maxBackoffSeconds?: number | Expression<number> | null;
+  maxBackoffSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * The maximum number of times to double the backoff between
    * retries. If left unspecified will default to 16.
    */
-  maxDoublings?: number | Expression<number> | null;
+  maxDoublings?: number | Expression<number> | ResetValue;
 
   /**
    * The minimum time to wait between attempts. If left unspecified
    * will default to 100ms.
    */
-  minBackoffSeconds?: number | Expression<number> | null;
+  minBackoffSeconds?: number | Expression<number> | ResetValue;
 }
 
 /** How congestion control should be applied to the function. */
@@ -66,19 +67,19 @@ export interface RateLimits {
    * The maximum number of requests that can be outstanding at a time.
    * If left unspecified, will default to 1000.
    */
-  maxConcurrentDispatches?: number | Expression<number> | null;
+  maxConcurrentDispatches?: number | Expression<number> | ResetValue;
 
   /**
    * The maximum number of requests that can be invoked per second.
    * If left unspecified, will default to 500.
    */
-  maxDispatchesPerSecond?: number | Expression<number> | null;
+  maxDispatchesPerSecond?: number | Expression<number> | ResetValue;
 }
 
 /** Metadata about the authorization used to invoke a function. */
 export interface AuthData {
   uid: string;
-  token: firebase.auth.DecodedIdToken;
+  token: DecodedIdToken;
 }
 
 /** Metadata about a call to a Task Queue function. */
@@ -114,20 +115,20 @@ export function onDispatchHandler<Req = any>(
   return async (req: https.Request, res: express.Response): Promise<void> => {
     try {
       if (!https.isValidRequest(req)) {
-        logger.error('Invalid request, unable to process.');
-        throw new https.HttpsError('invalid-argument', 'Bad Request');
+        logger.error("Invalid request, unable to process.");
+        throw new https.HttpsError("invalid-argument", "Bad Request");
       }
 
       const context: TaskContext = {};
       if (!process.env.FUNCTIONS_EMULATOR) {
-        const authHeader = req.header('Authorization') || '';
+        const authHeader = req.header("Authorization") || "";
         const token = authHeader.match(/^Bearer (.*)$/)?.[1];
         // Note: this should never happen since task queue functions are guarded by IAM.
         if (!token) {
-          throw new https.HttpsError('unauthenticated', 'Unauthenticated');
+          throw new https.HttpsError("unauthenticated", "Unauthenticated");
         }
         // We skip authenticating the token since tq functions are guarded by IAM.
-        const authToken = await https.unsafeDecodeIdToken(token);
+        const authToken = https.unsafeDecodeIdToken(token);
         context.auth = {
           uid: authToken.uid,
           token: authToken,
@@ -144,19 +145,20 @@ export function onDispatchHandler<Req = any>(
         };
         // For some reason the type system isn't picking up that the handler
         // is a one argument function.
-        await (handler as any)(arg);
+        await (handler as v2TaskHandler<Req>)(arg);
       }
 
       res.status(204).end();
     } catch (err) {
+      let httpErr: https.HttpsError = err;
       if (!(err instanceof https.HttpsError)) {
         // This doesn't count as an 'explicit' error.
-        logger.error('Unhandled error', err);
-        err = new https.HttpsError('internal', 'INTERNAL');
+        logger.error("Unhandled error", err);
+        httpErr = new https.HttpsError("internal", "INTERNAL");
       }
 
-      const { status } = err.httpErrorCode;
-      const body = { error: err.toJSON() };
+      const { status } = httpErr.httpErrorCode;
+      const body = { error: httpErr.toJSON() };
 
       res.status(status).send(body);
     }
diff --git a/src/common/timezone.ts b/src/common/timezone.ts
index 5af4980fc..121eec5b5 100644
--- a/src/common/timezone.ts
+++ b/src/common/timezone.ts
@@ -1,542 +1,542 @@
 export const tzDatabase: Record<string, string> = {
-  'Africa/Abidjan': '+00:00',
-  'Africa/Accra': '+00:00',
-  'Africa/Addis_Ababa': '+03:00',
-  'Africa/Algiers': '+01:00',
-  'Africa/Asmara': '+03:00',
-  'Africa/Asmera': '+03:00',
-  'Africa/Bamako': '+00:00',
-  'Africa/Bangui': '+01:00',
-  'Africa/Banjul': '+00:00',
-  'Africa/Blantyre': '+02:00',
-  'Africa/Brazzaville': '+01:00',
-  'Africa/Bujumbura': '+02:00',
-  'Africa/Cairo': '+02:00',
-  'Africa/Casablanca': '+00:00',
-  'Africa/Ceuta': '+01:00',
-  'Africa/Conakry': '+00:00',
-  'Africa/Dakar': '+00:00',
-  'Africa/Dar_es_Salaam': '+03:00',
-  'Africa/Djibouti': '+03:00',
-  'Africa/Douala': '+01:00',
-  'Africa/El_Aaiun': '+00:00',
-  'Africa/Freetown': '+00:00',
-  'Africa/Gaborone': '+02:00',
-  'Africa/Harare': '+02:00',
-  'Africa/Johannesburg': '+02:00',
-  'Africa/Juba': '+03:00',
-  'Africa/Kampala': '+03:00',
-  'Africa/Khartoum': '+03:00',
-  'Africa/Kigali': '+02:00',
-  'Africa/Kinshasa': '+01:00',
-  'Africa/Lagos': '+01:00',
-  'Africa/Libreville': '+01:00',
-  'Africa/Lome': '+00:00',
-  'Africa/Luanda': '+01:00',
-  'Africa/Lubumbashi': '+02:00',
-  'Africa/Lusaka': '+02:00',
-  'Africa/Malabo': '+01:00',
-  'Africa/Maputo': '+02:00',
-  'Africa/Maseru': '+02:00',
-  'Africa/Mbabane': '+02:00',
-  'Africa/Mogadishu': '+03:00',
-  'Africa/Monrovia': '+00:00',
-  'Africa/Nairobi': '+03:00',
-  'Africa/Ndjamena': '+01:00',
-  'Africa/Niamey': '+01:00',
-  'Africa/Nouakchott': '+00:00',
-  'Africa/Ouagadougou': '+00:00',
-  'Africa/Porto-Novo': '+01:00',
-  'Africa/Sao_Tome': '+00:00',
-  'Africa/Timbuktu': '+00:00',
-  'Africa/Tripoli': '+02:00',
-  'Africa/Tunis': '+01:00',
-  'Africa/Windhoek': '+01:00',
-  'America/Adak': '-10:00',
-  'America/Anchorage': '-09:00',
-  'America/Anguilla': '-04:00',
-  'America/Antigua': '-04:00',
-  'America/Araguaina': '-03:00',
-  'America/Argentina/Buenos_Aires': '-03:00',
-  'America/Argentina/Catamarca': '-03:00',
-  'America/Argentina/ComodRivadavia': '-03:00',
-  'America/Argentina/Cordoba': '-03:00',
-  'America/Argentina/Jujuy': '-03:00',
-  'America/Argentina/La_Rioja': '-03:00',
-  'America/Argentina/Mendoza': '-03:00',
-  'America/Argentina/Rio_Gallegos': '-03:00',
-  'America/Argentina/Salta': '-03:00',
-  'America/Argentina/San_Juan': '-03:00',
-  'America/Argentina/San_Luis': '-03:00',
-  'America/Argentina/Tucuman': '-03:00',
-  'America/Argentina/Ushuaia': '-03:00',
-  'America/Aruba': '-04:00',
-  'America/Asuncion': '-04:00',
-  'America/Atikokan': '-05:00',
-  'America/Atka': '-10:00',
-  'America/Bahia': '-03:00',
-  'America/Bahia_Banderas': '-06:00',
-  'America/Barbados': '-04:00',
-  'America/Belem': '-03:00',
-  'America/Belize': '-06:00',
-  'America/Blanc-Sablon': '-04:00',
-  'America/Boa_Vista': '-04:00',
-  'America/Bogota': '-05:00',
-  'America/Boise': '-07:00',
-  'America/Buenos_Aires': '-03:00',
-  'America/Cambridge_Bay': '-07:00',
-  'America/Campo_Grande': '-04:00',
-  'America/Cancun': '-06:00',
-  'America/Caracas': '-04:30',
-  'America/Catamarca': '-03:00',
-  'America/Cayenne': '-03:00',
-  'America/Cayman': '-05:00',
-  'America/Chicago': '-06:00',
-  'America/Chihuahua': '-07:00',
-  'America/Coral_Harbour': '-05:00',
-  'America/Cordoba': '-03:00',
-  'America/Costa_Rica': '-06:00',
-  'America/Creston': '-07:00',
-  'America/Cuiaba': '-04:00',
-  'America/Curacao': '-04:00',
-  'America/Danmarkshavn': '+00:00',
-  'America/Dawson': '-08:00',
-  'America/Dawson_Creek': '-07:00',
-  'America/Denver': '-07:00',
-  'America/Detroit': '-05:00',
-  'America/Dominica': '-04:00',
-  'America/Edmonton': '-07:00',
-  'America/Eirunepe': '-05:00',
-  'America/El_Salvador': '-06:00',
-  'America/Ensenada': '-08:00',
-  'America/Fort_Wayne': '-05:00',
-  'America/Fortaleza': '-03:00',
-  'America/Glace_Bay': '-04:00',
-  'America/Godthab': '-03:00',
-  'America/Goose_Bay': '-04:00',
-  'America/Grand_Turk': '-05:00',
-  'America/Grenada': '-04:00',
-  'America/Guadeloupe': '-04:00',
-  'America/Guatemala': '-06:00',
-  'America/Guayaquil': '-05:00',
-  'America/Guyana': '-04:00',
-  'America/Halifax': '-04:00',
-  'America/Havana': '-05:00',
-  'America/Hermosillo': '-07:00',
-  'America/Indiana/Indianapolis': '-05:00',
-  'America/Indiana/Knox': '-06:00',
-  'America/Indiana/Marengo': '-05:00',
-  'America/Indiana/Petersburg': '-05:00',
-  'America/Indiana/Tell_City': '-06:00',
-  'America/Indiana/Valparaiso': '-06:00',
-  'America/Indiana/Vevay': '-05:00',
-  'America/Indiana/Vincennes': '-05:00',
-  'America/Indiana/Winamac': '-05:00',
-  'America/Indianapolis': '-05:00',
-  'America/Inuvik': '-07:00',
-  'America/Iqaluit': '-05:00',
-  'America/Jamaica': '-05:00',
-  'America/Jujuy': '-03:00',
-  'America/Juneau': '-09:00',
-  'America/Kentucky/Louisville': '-05:00',
-  'America/Kentucky/Monticello': '-05:00',
-  'America/Knox_IN': '-06:00',
-  'America/Kralendijk': '-04:00',
-  'America/La_Paz': '-04:00',
-  'America/Lima': '-05:00',
-  'America/Los_Angeles': '-08:00',
-  'America/Louisville': '-05:00',
-  'America/Lower_Princes': '-04:00',
-  'America/Maceio': '-03:00',
-  'America/Managua': '-06:00',
-  'America/Manaus': '-04:00',
-  'America/Marigot': '-04:00',
-  'America/Martinique': '-04:00',
-  'America/Matamoros': '-06:00',
-  'America/Mazatlan': '-07:00',
-  'America/Mendoza': '-03:00',
-  'America/Menominee': '-06:00',
-  'America/Merida': '-06:00',
-  'America/Metlakatla': '-08:00',
-  'America/Mexico_City': '-06:00',
-  'America/Miquelon': '-03:00',
-  'America/Moncton': '-04:00',
-  'America/Monterrey': '-06:00',
-  'America/Montevideo': '-03:00',
-  'America/Montreal': '-05:00',
-  'America/Montserrat': '-04:00',
-  'America/Nassau': '-05:00',
-  'America/New_York': '-05:00',
-  'America/Nipigon': '-05:00',
-  'America/Nome': '-09:00',
-  'America/Noronha': '-02:00',
-  'America/North_Dakota/Beulah': '-06:00',
-  'America/North_Dakota/Center': '-06:00',
-  'America/North_Dakota/New_Salem': '-06:00',
-  'America/Ojinaga': '-07:00',
-  'America/Panama': '-05:00',
-  'America/Pangnirtung': '-05:00',
-  'America/Paramaribo': '-03:00',
-  'America/Phoenix': '-07:00',
-  'America/Port_of_Spain': '-04:00',
-  'America/Port-au-Prince': '-05:00',
-  'America/Porto_Acre': '-05:00',
-  'America/Porto_Velho': '-04:00',
-  'America/Puerto_Rico': '-04:00',
-  'America/Rainy_River': '-06:00',
-  'America/Rankin_Inlet': '-06:00',
-  'America/Recife': '-03:00',
-  'America/Regina': '-06:00',
-  'America/Resolute': '-06:00',
-  'America/Rio_Branco': '-05:00',
-  'America/Rosario': '-03:00',
-  'America/Santa_Isabel': '-08:00',
-  'America/Santarem': '-03:00',
-  'America/Santiago': '-03:00',
-  'America/Santo_Domingo': '-04:00',
-  'America/Sao_Paulo': '-03:00',
-  'America/Scoresbysund': '-01:00',
-  'America/Shiprock': '-07:00',
-  'America/Sitka': '-09:00',
-  'America/St_Barthelemy': '-04:00',
-  'America/St_Johns': '-03:30',
-  'America/St_Kitts': '-04:00',
-  'America/St_Lucia': '-04:00',
-  'America/St_Thomas': '-04:00',
-  'America/St_Vincent': '-04:00',
-  'America/Swift_Current': '-06:00',
-  'America/Tegucigalpa': '-06:00',
-  'America/Thule': '-04:00',
-  'America/Thunder_Bay': '-05:00',
-  'America/Tijuana': '-08:00',
-  'America/Toronto': '-05:00',
-  'America/Tortola': '-04:00',
-  'America/Vancouver': '-08:00',
-  'America/Virgin': '-04:00',
-  'America/Whitehorse': '-08:00',
-  'America/Winnipeg': '-06:00',
-  'America/Yakutat': '-09:00',
-  'America/Yellowknife': '-07:00',
-  'Antarctica/Casey': '+11:00',
-  'Antarctica/Davis': '+05:00',
-  'Antarctica/DumontDUrville': '+10:00',
-  'Antarctica/Macquarie': '+11:00',
-  'Antarctica/Mawson': '+05:00',
-  'Antarctica/McMurdo': '+12:00',
-  'Antarctica/Palmer': '-04:00',
-  'Antarctica/Rothera': '-03:00',
-  'Antarctica/South_Pole': '+12:00',
-  'Antarctica/Syowa': '+03:00',
-  'Antarctica/Troll': '+00:00',
-  'Antarctica/Vostok': '+06:00',
-  'Arctic/Longyearbyen': '+01:00',
-  'Asia/Aden': '+03:00',
-  'Asia/Almaty': '+06:00',
-  'Asia/Amman': '+02:00',
-  'Asia/Anadyr': '+12:00',
-  'Asia/Aqtau': '+05:00',
-  'Asia/Aqtobe': '+05:00',
-  'Asia/Ashgabat': '+05:00',
-  'Asia/Ashkhabad': '+05:00',
-  'Asia/Baghdad': '+03:00',
-  'Asia/Bahrain': '+03:00',
-  'Asia/Baku': '+04:00',
-  'Asia/Bangkok': '+07:00',
-  'Asia/Beirut': '+02:00',
-  'Asia/Bishkek': '+06:00',
-  'Asia/Brunei': '+08:00',
-  'Asia/Calcutta': '+05:30',
-  'Asia/Choibalsan': '+08:00',
-  'Asia/Chongqing': '+08:00',
-  'Asia/Chungking': '+08:00',
-  'Asia/Colombo': '+05:30',
-  'Asia/Dacca': '+06:00',
-  'Asia/Damascus': '+02:00',
-  'Asia/Dhaka': '+06:00',
-  'Asia/Dili': '+09:00',
-  'Asia/Dubai': '+04:00',
-  'Asia/Dushanbe': '+05:00',
-  'Asia/Gaza': '+02:00',
-  'Asia/Harbin': '+08:00',
-  'Asia/Hebron': '+02:00',
-  'Asia/Ho_Chi_Minh': '+07:00',
-  'Asia/Hong_Kong': '+08:00',
-  'Asia/Hovd': '+07:00',
-  'Asia/Irkutsk': '+08:00',
-  'Asia/Istanbul': '+02:00',
-  'Asia/Jakarta': '+07:00',
-  'Asia/Jayapura': '+09:00',
-  'Asia/Jerusalem': '+02:00',
-  'Asia/Kabul': '+04:30',
-  'Asia/Kamchatka': '+12:00',
-  'Asia/Karachi': '+05:00',
-  'Asia/Kashgar': '+08:00',
-  'Asia/Kathmandu': '+05:45',
-  'Asia/Katmandu': '+05:45',
-  'Asia/Khandyga': '+09:00',
-  'Asia/Kolkata': '+05:30',
-  'Asia/Krasnoyarsk': '+07:00',
-  'Asia/Kuala_Lumpur': '+08:00',
-  'Asia/Kuching': '+08:00',
-  'Asia/Kuwait': '+03:00',
-  'Asia/Macao': '+08:00',
-  'Asia/Macau': '+08:00',
-  'Asia/Magadan': '+10:00',
-  'Asia/Makassar': '+08:00',
-  'Asia/Manila': '+08:00',
-  'Asia/Muscat': '+04:00',
-  'Asia/Nicosia': '+02:00',
-  'Asia/Novokuznetsk': '+07:00',
-  'Asia/Novosibirsk': '+06:00',
-  'Asia/Omsk': '+06:00',
-  'Asia/Oral': '+05:00',
-  'Asia/Phnom_Penh': '+07:00',
-  'Asia/Pontianak': '+07:00',
-  'Asia/Pyongyang': '+09:00',
-  'Asia/Qatar': '+03:00',
-  'Asia/Qyzylorda': '+06:00',
-  'Asia/Rangoon': '+06:30',
-  'Asia/Riyadh': '+03:00',
-  'Asia/Saigon': '+07:00',
-  'Asia/Sakhalin': '+11:00',
-  'Asia/Samarkand': '+05:00',
-  'Asia/Seoul': '+09:00',
-  'Asia/Shanghai': '+08:00',
-  'Asia/Singapore': '+08:00',
-  'Asia/Taipei': '+08:00',
-  'Asia/Tashkent': '+05:00',
-  'Asia/Tbilisi': '+04:00',
-  'Asia/Tehran': '+03:30',
-  'Asia/Tel_Aviv': '+02:00',
-  'Asia/Thimbu': '+06:00',
-  'Asia/Thimphu': '+06:00',
-  'Asia/Tokyo': '+09:00',
-  'Asia/Ujung_Pandang': '+08:00',
-  'Asia/Ulaanbaatar': '+08:00',
-  'Asia/Ulan_Bator': '+08:00',
-  'Asia/Urumqi': '+08:00',
-  'Asia/Ust-Nera': '+10:00',
-  'Asia/Vientiane': '+07:00',
-  'Asia/Vladivostok': '+10:00',
-  'Asia/Yakutsk': '+09:00',
-  'Asia/Yekaterinburg': '+05:00',
-  'Asia/Yerevan': '+04:00',
-  'Atlantic/Azores': '-01:00',
-  'Atlantic/Bermuda': '-04:00',
-  'Atlantic/Canary': '+00:00',
-  'Atlantic/Cape_Verde': '-01:00',
-  'Atlantic/Faeroe': '+00:00',
-  'Atlantic/Faroe': '+00:00',
-  'Atlantic/Jan_Mayen': '+01:00',
-  'Atlantic/Madeira': '+00:00',
-  'Atlantic/Reykjavik': '+00:00',
-  'Atlantic/South_Georgia': '-02:00',
-  'Atlantic/St_Helena': '+00:00',
-  'Atlantic/Stanley': '-03:00',
-  'Australia/ACT': '+10:00',
-  'Australia/Adelaide': '+09:30',
-  'Australia/Brisbane': '+10:00',
-  'Australia/Broken_Hill': '+09:30',
-  'Australia/Canberra': '+10:00',
-  'Australia/Currie': '+10:00',
-  'Australia/Darwin': '+09:30',
-  'Australia/Eucla': '+08:45',
-  'Australia/Hobart': '+10:00',
-  'Australia/LHI': '+10:30',
-  'Australia/Lindeman': '+10:00',
-  'Australia/Lord_Howe': '+10:30',
-  'Australia/Melbourne': '+10:00',
-  'Australia/North': '+09:30',
-  'Australia/NSW': '+10:00',
-  'Australia/Perth': '+08:00',
-  'Australia/Queensland': '+10:00',
-  'Australia/South': '+09:30',
-  'Australia/Sydney': '+10:00',
-  'Australia/Tasmania': '+10:00',
-  'Australia/Victoria': '+10:00',
-  'Australia/West': '+08:00',
-  'Australia/Yancowinna': '+09:30',
-  'Brazil/Acre': '-05:00',
-  'Brazil/DeNoronha': '-02:00',
-  'Brazil/East': '-03:00',
-  'Brazil/West': '-04:00',
-  'Canada/Atlantic': '-04:00',
-  'Canada/Central': '-06:00',
-  'Canada/Eastern': '-05:00',
-  'Canada/East-Saskatchewan': '-06:00',
-  'Canada/Mountain': '-07:00',
-  'Canada/Newfoundland': '-03:30',
-  'Canada/Pacific': '-08:00',
-  'Canada/Saskatchewan': '-06:00',
-  'Canada/Yukon': '-08:00',
-  'Chile/Continental': '-03:00',
-  'Chile/EasterIsland': '-05:00',
-  Cuba: '-05:00',
-  Egypt: '+02:00',
-  Eire: '+00:00',
-  'Etc/GMT': '+00:00',
-  'Etc/GMT+0': '+00:00',
-  'Etc/UCT': '+00:00',
-  'Etc/Universal': '+00:00',
-  'Etc/UTC': '+00:00',
-  'Etc/Zulu': '+00:00',
-  'Europe/Amsterdam': '+01:00',
-  'Europe/Andorra': '+01:00',
-  'Europe/Athens': '+02:00',
-  'Europe/Belfast': '+00:00',
-  'Europe/Belgrade': '+01:00',
-  'Europe/Berlin': '+01:00',
-  'Europe/Bratislava': '+01:00',
-  'Europe/Brussels': '+01:00',
-  'Europe/Bucharest': '+02:00',
-  'Europe/Budapest': '+01:00',
-  'Europe/Busingen': '+01:00',
-  'Europe/Chisinau': '+02:00',
-  'Europe/Copenhagen': '+01:00',
-  'Europe/Dublin': '+00:00',
-  'Europe/Gibraltar': '+01:00',
-  'Europe/Guernsey': '+00:00',
-  'Europe/Helsinki': '+02:00',
-  'Europe/Isle_of_Man': '+00:00',
-  'Europe/Istanbul': '+02:00',
-  'Europe/Jersey': '+00:00',
-  'Europe/Kaliningrad': '+02:00',
-  'Europe/Kiev': '+02:00',
-  'Europe/Lisbon': '+00:00',
-  'Europe/Ljubljana': '+01:00',
-  'Europe/London': '+00:00',
-  'Europe/Luxembourg': '+01:00',
-  'Europe/Madrid': '+01:00',
-  'Europe/Malta': '+01:00',
-  'Europe/Mariehamn': '+02:00',
-  'Europe/Minsk': '+03:00',
-  'Europe/Monaco': '+01:00',
-  'Europe/Moscow': '+03:00',
-  'Europe/Nicosia': '+02:00',
-  'Europe/Oslo': '+01:00',
-  'Europe/Paris': '+01:00',
-  'Europe/Podgorica': '+01:00',
-  'Europe/Prague': '+01:00',
-  'Europe/Riga': '+02:00',
-  'Europe/Rome': '+01:00',
-  'Europe/Samara': '+04:00',
-  'Europe/San_Marino': '+01:00',
-  'Europe/Sarajevo': '+01:00',
-  'Europe/Simferopol': '+03:00',
-  'Europe/Skopje': '+01:00',
-  'Europe/Sofia': '+02:00',
-  'Europe/Stockholm': '+01:00',
-  'Europe/Tallinn': '+02:00',
-  'Europe/Tirane': '+01:00',
-  'Europe/Tiraspol': '+02:00',
-  'Europe/Uzhgorod': '+02:00',
-  'Europe/Vaduz': '+01:00',
-  'Europe/Vatican': '+01:00',
-  'Europe/Vienna': '+01:00',
-  'Europe/Vilnius': '+02:00',
-  'Europe/Volgograd': '+03:00',
-  'Europe/Warsaw': '+01:00',
-  'Europe/Zagreb': '+01:00',
-  'Europe/Zaporozhye': '+02:00',
-  'Europe/Zurich': '+01:00',
-  GB: '+00:00',
-  'GB-Eire': '+00:00',
-  GMT: '+00:00',
-  'GMT+0': '+00:00',
-  GMT0: '+00:00',
-  'GMT-0': '+00:00',
-  Greenwich: '+00:00',
-  Hongkong: '+08:00',
-  Iceland: '+00:00',
-  'Indian/Antananarivo': '+03:00',
-  'Indian/Chagos': '+06:00',
-  'Indian/Christmas': '+07:00',
-  'Indian/Cocos': '+06:30',
-  'Indian/Comoro': '+03:00',
-  'Indian/Kerguelen': '+05:00',
-  'Indian/Mahe': '+04:00',
-  'Indian/Maldives': '+05:00',
-  'Indian/Mauritius': '+04:00',
-  'Indian/Mayotte': '+03:00',
-  'Indian/Reunion': '+04:00',
-  Iran: '+03:30',
-  Israel: '+02:00',
-  Jamaica: '-05:00',
-  Japan: '+09:00',
-  Kwajalein: '+12:00',
-  Libya: '+02:00',
-  'Mexico/BajaNorte': '-08:00',
-  'Mexico/BajaSur': '-07:00',
-  'Mexico/General': '-06:00',
-  Navajo: '-07:00',
-  NZ: '+12:00',
-  'NZ-CHAT': '+12:45',
-  'Pacific/Apia': '+13:00',
-  'Pacific/Auckland': '+12:00',
-  'Pacific/Chatham': '+12:45',
-  'Pacific/Chuuk': '+10:00',
-  'Pacific/Easter': '-06:00',
-  'Pacific/Efate': '+11:00',
-  'Pacific/Enderbury': '+13:00',
-  'Pacific/Fakaofo': '+13:00',
-  'Pacific/Fiji': '+12:00',
-  'Pacific/Funafuti': '+12:00',
-  'Pacific/Galapagos': '-06:00',
-  'Pacific/Gambier': '-09:00',
-  'Pacific/Guadalcanal': '+11:00',
-  'Pacific/Guam': '+10:00',
-  'Pacific/Honolulu': '-10:00',
-  'Pacific/Johnston': '-10:00',
-  'Pacific/Kiritimati': '+14:00',
-  'Pacific/Kosrae': '+11:00',
-  'Pacific/Kwajalein': '+12:00',
-  'Pacific/Majuro': '+12:00',
-  'Pacific/Marquesas': '-09:30',
-  'Pacific/Midway': '-11:00',
-  'Pacific/Nauru': '+12:00',
-  'Pacific/Niue': '-11:00',
-  'Pacific/Norfolk': '+11:30',
-  'Pacific/Noumea': '+11:00',
-  'Pacific/Pago_Pago': '-11:00',
-  'Pacific/Palau': '+09:00',
-  'Pacific/Pitcairn': '-08:00',
-  'Pacific/Pohnpei': '+11:00',
-  'Pacific/Ponape': '+11:00',
-  'Pacific/Port_Moresby': '+10:00',
-  'Pacific/Rarotonga': '-10:00',
-  'Pacific/Saipan': '+10:00',
-  'Pacific/Samoa': '-11:00',
-  'Pacific/Tahiti': '-10:00',
-  'Pacific/Tarawa': '+12:00',
-  'Pacific/Tongatapu': '+13:00',
-  'Pacific/Truk': '+10:00',
-  'Pacific/Wake': '+12:00',
-  'Pacific/Wallis': '+12:00',
-  'Pacific/Yap': '+10:00',
-  Poland: '+01:00',
-  Portugal: '+00:00',
-  PRC: '+08:00',
-  ROC: '+08:00',
-  ROK: '+09:00',
-  Singapore: '+08:00',
-  Turkey: '+02:00',
-  UCT: '+00:00',
-  Universal: '+00:00',
-  'US/Alaska': '-09:00',
-  'US/Aleutian': '-10:00',
-  'US/Arizona': '-07:00',
-  'US/Central': '-06:00',
-  'US/Eastern': '-05:00',
-  'US/East-Indiana': '-05:00',
-  'US/Hawaii': '-10:00',
-  'US/Indiana-Starke': '-06:00',
-  'US/Michigan': '-05:00',
-  'US/Mountain': '-07:00',
-  'US/Pacific': '-08:00',
-  'US/Samoa': '-11:00',
-  UTC: '+00:00',
-  'W-SU': '+03:00',
-  Zulu: '+00:00',
+  "Africa/Abidjan": "+00:00",
+  "Africa/Accra": "+00:00",
+  "Africa/Addis_Ababa": "+03:00",
+  "Africa/Algiers": "+01:00",
+  "Africa/Asmara": "+03:00",
+  "Africa/Asmera": "+03:00",
+  "Africa/Bamako": "+00:00",
+  "Africa/Bangui": "+01:00",
+  "Africa/Banjul": "+00:00",
+  "Africa/Blantyre": "+02:00",
+  "Africa/Brazzaville": "+01:00",
+  "Africa/Bujumbura": "+02:00",
+  "Africa/Cairo": "+02:00",
+  "Africa/Casablanca": "+00:00",
+  "Africa/Ceuta": "+01:00",
+  "Africa/Conakry": "+00:00",
+  "Africa/Dakar": "+00:00",
+  "Africa/Dar_es_Salaam": "+03:00",
+  "Africa/Djibouti": "+03:00",
+  "Africa/Douala": "+01:00",
+  "Africa/El_Aaiun": "+00:00",
+  "Africa/Freetown": "+00:00",
+  "Africa/Gaborone": "+02:00",
+  "Africa/Harare": "+02:00",
+  "Africa/Johannesburg": "+02:00",
+  "Africa/Juba": "+03:00",
+  "Africa/Kampala": "+03:00",
+  "Africa/Khartoum": "+03:00",
+  "Africa/Kigali": "+02:00",
+  "Africa/Kinshasa": "+01:00",
+  "Africa/Lagos": "+01:00",
+  "Africa/Libreville": "+01:00",
+  "Africa/Lome": "+00:00",
+  "Africa/Luanda": "+01:00",
+  "Africa/Lubumbashi": "+02:00",
+  "Africa/Lusaka": "+02:00",
+  "Africa/Malabo": "+01:00",
+  "Africa/Maputo": "+02:00",
+  "Africa/Maseru": "+02:00",
+  "Africa/Mbabane": "+02:00",
+  "Africa/Mogadishu": "+03:00",
+  "Africa/Monrovia": "+00:00",
+  "Africa/Nairobi": "+03:00",
+  "Africa/Ndjamena": "+01:00",
+  "Africa/Niamey": "+01:00",
+  "Africa/Nouakchott": "+00:00",
+  "Africa/Ouagadougou": "+00:00",
+  "Africa/Porto-Novo": "+01:00",
+  "Africa/Sao_Tome": "+00:00",
+  "Africa/Timbuktu": "+00:00",
+  "Africa/Tripoli": "+02:00",
+  "Africa/Tunis": "+01:00",
+  "Africa/Windhoek": "+01:00",
+  "America/Adak": "-10:00",
+  "America/Anchorage": "-09:00",
+  "America/Anguilla": "-04:00",
+  "America/Antigua": "-04:00",
+  "America/Araguaina": "-03:00",
+  "America/Argentina/Buenos_Aires": "-03:00",
+  "America/Argentina/Catamarca": "-03:00",
+  "America/Argentina/ComodRivadavia": "-03:00",
+  "America/Argentina/Cordoba": "-03:00",
+  "America/Argentina/Jujuy": "-03:00",
+  "America/Argentina/La_Rioja": "-03:00",
+  "America/Argentina/Mendoza": "-03:00",
+  "America/Argentina/Rio_Gallegos": "-03:00",
+  "America/Argentina/Salta": "-03:00",
+  "America/Argentina/San_Juan": "-03:00",
+  "America/Argentina/San_Luis": "-03:00",
+  "America/Argentina/Tucuman": "-03:00",
+  "America/Argentina/Ushuaia": "-03:00",
+  "America/Aruba": "-04:00",
+  "America/Asuncion": "-04:00",
+  "America/Atikokan": "-05:00",
+  "America/Atka": "-10:00",
+  "America/Bahia": "-03:00",
+  "America/Bahia_Banderas": "-06:00",
+  "America/Barbados": "-04:00",
+  "America/Belem": "-03:00",
+  "America/Belize": "-06:00",
+  "America/Blanc-Sablon": "-04:00",
+  "America/Boa_Vista": "-04:00",
+  "America/Bogota": "-05:00",
+  "America/Boise": "-07:00",
+  "America/Buenos_Aires": "-03:00",
+  "America/Cambridge_Bay": "-07:00",
+  "America/Campo_Grande": "-04:00",
+  "America/Cancun": "-06:00",
+  "America/Caracas": "-04:30",
+  "America/Catamarca": "-03:00",
+  "America/Cayenne": "-03:00",
+  "America/Cayman": "-05:00",
+  "America/Chicago": "-06:00",
+  "America/Chihuahua": "-07:00",
+  "America/Coral_Harbour": "-05:00",
+  "America/Cordoba": "-03:00",
+  "America/Costa_Rica": "-06:00",
+  "America/Creston": "-07:00",
+  "America/Cuiaba": "-04:00",
+  "America/Curacao": "-04:00",
+  "America/Danmarkshavn": "+00:00",
+  "America/Dawson": "-08:00",
+  "America/Dawson_Creek": "-07:00",
+  "America/Denver": "-07:00",
+  "America/Detroit": "-05:00",
+  "America/Dominica": "-04:00",
+  "America/Edmonton": "-07:00",
+  "America/Eirunepe": "-05:00",
+  "America/El_Salvador": "-06:00",
+  "America/Ensenada": "-08:00",
+  "America/Fort_Wayne": "-05:00",
+  "America/Fortaleza": "-03:00",
+  "America/Glace_Bay": "-04:00",
+  "America/Godthab": "-03:00",
+  "America/Goose_Bay": "-04:00",
+  "America/Grand_Turk": "-05:00",
+  "America/Grenada": "-04:00",
+  "America/Guadeloupe": "-04:00",
+  "America/Guatemala": "-06:00",
+  "America/Guayaquil": "-05:00",
+  "America/Guyana": "-04:00",
+  "America/Halifax": "-04:00",
+  "America/Havana": "-05:00",
+  "America/Hermosillo": "-07:00",
+  "America/Indiana/Indianapolis": "-05:00",
+  "America/Indiana/Knox": "-06:00",
+  "America/Indiana/Marengo": "-05:00",
+  "America/Indiana/Petersburg": "-05:00",
+  "America/Indiana/Tell_City": "-06:00",
+  "America/Indiana/Valparaiso": "-06:00",
+  "America/Indiana/Vevay": "-05:00",
+  "America/Indiana/Vincennes": "-05:00",
+  "America/Indiana/Winamac": "-05:00",
+  "America/Indianapolis": "-05:00",
+  "America/Inuvik": "-07:00",
+  "America/Iqaluit": "-05:00",
+  "America/Jamaica": "-05:00",
+  "America/Jujuy": "-03:00",
+  "America/Juneau": "-09:00",
+  "America/Kentucky/Louisville": "-05:00",
+  "America/Kentucky/Monticello": "-05:00",
+  "America/Knox_IN": "-06:00",
+  "America/Kralendijk": "-04:00",
+  "America/La_Paz": "-04:00",
+  "America/Lima": "-05:00",
+  "America/Los_Angeles": "-08:00",
+  "America/Louisville": "-05:00",
+  "America/Lower_Princes": "-04:00",
+  "America/Maceio": "-03:00",
+  "America/Managua": "-06:00",
+  "America/Manaus": "-04:00",
+  "America/Marigot": "-04:00",
+  "America/Martinique": "-04:00",
+  "America/Matamoros": "-06:00",
+  "America/Mazatlan": "-07:00",
+  "America/Mendoza": "-03:00",
+  "America/Menominee": "-06:00",
+  "America/Merida": "-06:00",
+  "America/Metlakatla": "-08:00",
+  "America/Mexico_City": "-06:00",
+  "America/Miquelon": "-03:00",
+  "America/Moncton": "-04:00",
+  "America/Monterrey": "-06:00",
+  "America/Montevideo": "-03:00",
+  "America/Montreal": "-05:00",
+  "America/Montserrat": "-04:00",
+  "America/Nassau": "-05:00",
+  "America/New_York": "-05:00",
+  "America/Nipigon": "-05:00",
+  "America/Nome": "-09:00",
+  "America/Noronha": "-02:00",
+  "America/North_Dakota/Beulah": "-06:00",
+  "America/North_Dakota/Center": "-06:00",
+  "America/North_Dakota/New_Salem": "-06:00",
+  "America/Ojinaga": "-07:00",
+  "America/Panama": "-05:00",
+  "America/Pangnirtung": "-05:00",
+  "America/Paramaribo": "-03:00",
+  "America/Phoenix": "-07:00",
+  "America/Port_of_Spain": "-04:00",
+  "America/Port-au-Prince": "-05:00",
+  "America/Porto_Acre": "-05:00",
+  "America/Porto_Velho": "-04:00",
+  "America/Puerto_Rico": "-04:00",
+  "America/Rainy_River": "-06:00",
+  "America/Rankin_Inlet": "-06:00",
+  "America/Recife": "-03:00",
+  "America/Regina": "-06:00",
+  "America/Resolute": "-06:00",
+  "America/Rio_Branco": "-05:00",
+  "America/Rosario": "-03:00",
+  "America/Santa_Isabel": "-08:00",
+  "America/Santarem": "-03:00",
+  "America/Santiago": "-03:00",
+  "America/Santo_Domingo": "-04:00",
+  "America/Sao_Paulo": "-03:00",
+  "America/Scoresbysund": "-01:00",
+  "America/Shiprock": "-07:00",
+  "America/Sitka": "-09:00",
+  "America/St_Barthelemy": "-04:00",
+  "America/St_Johns": "-03:30",
+  "America/St_Kitts": "-04:00",
+  "America/St_Lucia": "-04:00",
+  "America/St_Thomas": "-04:00",
+  "America/St_Vincent": "-04:00",
+  "America/Swift_Current": "-06:00",
+  "America/Tegucigalpa": "-06:00",
+  "America/Thule": "-04:00",
+  "America/Thunder_Bay": "-05:00",
+  "America/Tijuana": "-08:00",
+  "America/Toronto": "-05:00",
+  "America/Tortola": "-04:00",
+  "America/Vancouver": "-08:00",
+  "America/Virgin": "-04:00",
+  "America/Whitehorse": "-08:00",
+  "America/Winnipeg": "-06:00",
+  "America/Yakutat": "-09:00",
+  "America/Yellowknife": "-07:00",
+  "Antarctica/Casey": "+11:00",
+  "Antarctica/Davis": "+05:00",
+  "Antarctica/DumontDUrville": "+10:00",
+  "Antarctica/Macquarie": "+11:00",
+  "Antarctica/Mawson": "+05:00",
+  "Antarctica/McMurdo": "+12:00",
+  "Antarctica/Palmer": "-04:00",
+  "Antarctica/Rothera": "-03:00",
+  "Antarctica/South_Pole": "+12:00",
+  "Antarctica/Syowa": "+03:00",
+  "Antarctica/Troll": "+00:00",
+  "Antarctica/Vostok": "+06:00",
+  "Arctic/Longyearbyen": "+01:00",
+  "Asia/Aden": "+03:00",
+  "Asia/Almaty": "+06:00",
+  "Asia/Amman": "+02:00",
+  "Asia/Anadyr": "+12:00",
+  "Asia/Aqtau": "+05:00",
+  "Asia/Aqtobe": "+05:00",
+  "Asia/Ashgabat": "+05:00",
+  "Asia/Ashkhabad": "+05:00",
+  "Asia/Baghdad": "+03:00",
+  "Asia/Bahrain": "+03:00",
+  "Asia/Baku": "+04:00",
+  "Asia/Bangkok": "+07:00",
+  "Asia/Beirut": "+02:00",
+  "Asia/Bishkek": "+06:00",
+  "Asia/Brunei": "+08:00",
+  "Asia/Calcutta": "+05:30",
+  "Asia/Choibalsan": "+08:00",
+  "Asia/Chongqing": "+08:00",
+  "Asia/Chungking": "+08:00",
+  "Asia/Colombo": "+05:30",
+  "Asia/Dacca": "+06:00",
+  "Asia/Damascus": "+02:00",
+  "Asia/Dhaka": "+06:00",
+  "Asia/Dili": "+09:00",
+  "Asia/Dubai": "+04:00",
+  "Asia/Dushanbe": "+05:00",
+  "Asia/Gaza": "+02:00",
+  "Asia/Harbin": "+08:00",
+  "Asia/Hebron": "+02:00",
+  "Asia/Ho_Chi_Minh": "+07:00",
+  "Asia/Hong_Kong": "+08:00",
+  "Asia/Hovd": "+07:00",
+  "Asia/Irkutsk": "+08:00",
+  "Asia/Istanbul": "+02:00",
+  "Asia/Jakarta": "+07:00",
+  "Asia/Jayapura": "+09:00",
+  "Asia/Jerusalem": "+02:00",
+  "Asia/Kabul": "+04:30",
+  "Asia/Kamchatka": "+12:00",
+  "Asia/Karachi": "+05:00",
+  "Asia/Kashgar": "+08:00",
+  "Asia/Kathmandu": "+05:45",
+  "Asia/Katmandu": "+05:45",
+  "Asia/Khandyga": "+09:00",
+  "Asia/Kolkata": "+05:30",
+  "Asia/Krasnoyarsk": "+07:00",
+  "Asia/Kuala_Lumpur": "+08:00",
+  "Asia/Kuching": "+08:00",
+  "Asia/Kuwait": "+03:00",
+  "Asia/Macao": "+08:00",
+  "Asia/Macau": "+08:00",
+  "Asia/Magadan": "+10:00",
+  "Asia/Makassar": "+08:00",
+  "Asia/Manila": "+08:00",
+  "Asia/Muscat": "+04:00",
+  "Asia/Nicosia": "+02:00",
+  "Asia/Novokuznetsk": "+07:00",
+  "Asia/Novosibirsk": "+06:00",
+  "Asia/Omsk": "+06:00",
+  "Asia/Oral": "+05:00",
+  "Asia/Phnom_Penh": "+07:00",
+  "Asia/Pontianak": "+07:00",
+  "Asia/Pyongyang": "+09:00",
+  "Asia/Qatar": "+03:00",
+  "Asia/Qyzylorda": "+06:00",
+  "Asia/Rangoon": "+06:30",
+  "Asia/Riyadh": "+03:00",
+  "Asia/Saigon": "+07:00",
+  "Asia/Sakhalin": "+11:00",
+  "Asia/Samarkand": "+05:00",
+  "Asia/Seoul": "+09:00",
+  "Asia/Shanghai": "+08:00",
+  "Asia/Singapore": "+08:00",
+  "Asia/Taipei": "+08:00",
+  "Asia/Tashkent": "+05:00",
+  "Asia/Tbilisi": "+04:00",
+  "Asia/Tehran": "+03:30",
+  "Asia/Tel_Aviv": "+02:00",
+  "Asia/Thimbu": "+06:00",
+  "Asia/Thimphu": "+06:00",
+  "Asia/Tokyo": "+09:00",
+  "Asia/Ujung_Pandang": "+08:00",
+  "Asia/Ulaanbaatar": "+08:00",
+  "Asia/Ulan_Bator": "+08:00",
+  "Asia/Urumqi": "+08:00",
+  "Asia/Ust-Nera": "+10:00",
+  "Asia/Vientiane": "+07:00",
+  "Asia/Vladivostok": "+10:00",
+  "Asia/Yakutsk": "+09:00",
+  "Asia/Yekaterinburg": "+05:00",
+  "Asia/Yerevan": "+04:00",
+  "Atlantic/Azores": "-01:00",
+  "Atlantic/Bermuda": "-04:00",
+  "Atlantic/Canary": "+00:00",
+  "Atlantic/Cape_Verde": "-01:00",
+  "Atlantic/Faeroe": "+00:00",
+  "Atlantic/Faroe": "+00:00",
+  "Atlantic/Jan_Mayen": "+01:00",
+  "Atlantic/Madeira": "+00:00",
+  "Atlantic/Reykjavik": "+00:00",
+  "Atlantic/South_Georgia": "-02:00",
+  "Atlantic/St_Helena": "+00:00",
+  "Atlantic/Stanley": "-03:00",
+  "Australia/ACT": "+10:00",
+  "Australia/Adelaide": "+09:30",
+  "Australia/Brisbane": "+10:00",
+  "Australia/Broken_Hill": "+09:30",
+  "Australia/Canberra": "+10:00",
+  "Australia/Currie": "+10:00",
+  "Australia/Darwin": "+09:30",
+  "Australia/Eucla": "+08:45",
+  "Australia/Hobart": "+10:00",
+  "Australia/LHI": "+10:30",
+  "Australia/Lindeman": "+10:00",
+  "Australia/Lord_Howe": "+10:30",
+  "Australia/Melbourne": "+10:00",
+  "Australia/North": "+09:30",
+  "Australia/NSW": "+10:00",
+  "Australia/Perth": "+08:00",
+  "Australia/Queensland": "+10:00",
+  "Australia/South": "+09:30",
+  "Australia/Sydney": "+10:00",
+  "Australia/Tasmania": "+10:00",
+  "Australia/Victoria": "+10:00",
+  "Australia/West": "+08:00",
+  "Australia/Yancowinna": "+09:30",
+  "Brazil/Acre": "-05:00",
+  "Brazil/DeNoronha": "-02:00",
+  "Brazil/East": "-03:00",
+  "Brazil/West": "-04:00",
+  "Canada/Atlantic": "-04:00",
+  "Canada/Central": "-06:00",
+  "Canada/Eastern": "-05:00",
+  "Canada/East-Saskatchewan": "-06:00",
+  "Canada/Mountain": "-07:00",
+  "Canada/Newfoundland": "-03:30",
+  "Canada/Pacific": "-08:00",
+  "Canada/Saskatchewan": "-06:00",
+  "Canada/Yukon": "-08:00",
+  "Chile/Continental": "-03:00",
+  "Chile/EasterIsland": "-05:00",
+  Cuba: "-05:00",
+  Egypt: "+02:00",
+  Eire: "+00:00",
+  "Etc/GMT": "+00:00",
+  "Etc/GMT+0": "+00:00",
+  "Etc/UCT": "+00:00",
+  "Etc/Universal": "+00:00",
+  "Etc/UTC": "+00:00",
+  "Etc/Zulu": "+00:00",
+  "Europe/Amsterdam": "+01:00",
+  "Europe/Andorra": "+01:00",
+  "Europe/Athens": "+02:00",
+  "Europe/Belfast": "+00:00",
+  "Europe/Belgrade": "+01:00",
+  "Europe/Berlin": "+01:00",
+  "Europe/Bratislava": "+01:00",
+  "Europe/Brussels": "+01:00",
+  "Europe/Bucharest": "+02:00",
+  "Europe/Budapest": "+01:00",
+  "Europe/Busingen": "+01:00",
+  "Europe/Chisinau": "+02:00",
+  "Europe/Copenhagen": "+01:00",
+  "Europe/Dublin": "+00:00",
+  "Europe/Gibraltar": "+01:00",
+  "Europe/Guernsey": "+00:00",
+  "Europe/Helsinki": "+02:00",
+  "Europe/Isle_of_Man": "+00:00",
+  "Europe/Istanbul": "+02:00",
+  "Europe/Jersey": "+00:00",
+  "Europe/Kaliningrad": "+02:00",
+  "Europe/Kiev": "+02:00",
+  "Europe/Lisbon": "+00:00",
+  "Europe/Ljubljana": "+01:00",
+  "Europe/London": "+00:00",
+  "Europe/Luxembourg": "+01:00",
+  "Europe/Madrid": "+01:00",
+  "Europe/Malta": "+01:00",
+  "Europe/Mariehamn": "+02:00",
+  "Europe/Minsk": "+03:00",
+  "Europe/Monaco": "+01:00",
+  "Europe/Moscow": "+03:00",
+  "Europe/Nicosia": "+02:00",
+  "Europe/Oslo": "+01:00",
+  "Europe/Paris": "+01:00",
+  "Europe/Podgorica": "+01:00",
+  "Europe/Prague": "+01:00",
+  "Europe/Riga": "+02:00",
+  "Europe/Rome": "+01:00",
+  "Europe/Samara": "+04:00",
+  "Europe/San_Marino": "+01:00",
+  "Europe/Sarajevo": "+01:00",
+  "Europe/Simferopol": "+03:00",
+  "Europe/Skopje": "+01:00",
+  "Europe/Sofia": "+02:00",
+  "Europe/Stockholm": "+01:00",
+  "Europe/Tallinn": "+02:00",
+  "Europe/Tirane": "+01:00",
+  "Europe/Tiraspol": "+02:00",
+  "Europe/Uzhgorod": "+02:00",
+  "Europe/Vaduz": "+01:00",
+  "Europe/Vatican": "+01:00",
+  "Europe/Vienna": "+01:00",
+  "Europe/Vilnius": "+02:00",
+  "Europe/Volgograd": "+03:00",
+  "Europe/Warsaw": "+01:00",
+  "Europe/Zagreb": "+01:00",
+  "Europe/Zaporozhye": "+02:00",
+  "Europe/Zurich": "+01:00",
+  GB: "+00:00",
+  "GB-Eire": "+00:00",
+  GMT: "+00:00",
+  "GMT+0": "+00:00",
+  GMT0: "+00:00",
+  "GMT-0": "+00:00",
+  Greenwich: "+00:00",
+  Hongkong: "+08:00",
+  Iceland: "+00:00",
+  "Indian/Antananarivo": "+03:00",
+  "Indian/Chagos": "+06:00",
+  "Indian/Christmas": "+07:00",
+  "Indian/Cocos": "+06:30",
+  "Indian/Comoro": "+03:00",
+  "Indian/Kerguelen": "+05:00",
+  "Indian/Mahe": "+04:00",
+  "Indian/Maldives": "+05:00",
+  "Indian/Mauritius": "+04:00",
+  "Indian/Mayotte": "+03:00",
+  "Indian/Reunion": "+04:00",
+  Iran: "+03:30",
+  Israel: "+02:00",
+  Jamaica: "-05:00",
+  Japan: "+09:00",
+  Kwajalein: "+12:00",
+  Libya: "+02:00",
+  "Mexico/BajaNorte": "-08:00",
+  "Mexico/BajaSur": "-07:00",
+  "Mexico/General": "-06:00",
+  Navajo: "-07:00",
+  NZ: "+12:00",
+  "NZ-CHAT": "+12:45",
+  "Pacific/Apia": "+13:00",
+  "Pacific/Auckland": "+12:00",
+  "Pacific/Chatham": "+12:45",
+  "Pacific/Chuuk": "+10:00",
+  "Pacific/Easter": "-06:00",
+  "Pacific/Efate": "+11:00",
+  "Pacific/Enderbury": "+13:00",
+  "Pacific/Fakaofo": "+13:00",
+  "Pacific/Fiji": "+12:00",
+  "Pacific/Funafuti": "+12:00",
+  "Pacific/Galapagos": "-06:00",
+  "Pacific/Gambier": "-09:00",
+  "Pacific/Guadalcanal": "+11:00",
+  "Pacific/Guam": "+10:00",
+  "Pacific/Honolulu": "-10:00",
+  "Pacific/Johnston": "-10:00",
+  "Pacific/Kiritimati": "+14:00",
+  "Pacific/Kosrae": "+11:00",
+  "Pacific/Kwajalein": "+12:00",
+  "Pacific/Majuro": "+12:00",
+  "Pacific/Marquesas": "-09:30",
+  "Pacific/Midway": "-11:00",
+  "Pacific/Nauru": "+12:00",
+  "Pacific/Niue": "-11:00",
+  "Pacific/Norfolk": "+11:30",
+  "Pacific/Noumea": "+11:00",
+  "Pacific/Pago_Pago": "-11:00",
+  "Pacific/Palau": "+09:00",
+  "Pacific/Pitcairn": "-08:00",
+  "Pacific/Pohnpei": "+11:00",
+  "Pacific/Ponape": "+11:00",
+  "Pacific/Port_Moresby": "+10:00",
+  "Pacific/Rarotonga": "-10:00",
+  "Pacific/Saipan": "+10:00",
+  "Pacific/Samoa": "-11:00",
+  "Pacific/Tahiti": "-10:00",
+  "Pacific/Tarawa": "+12:00",
+  "Pacific/Tongatapu": "+13:00",
+  "Pacific/Truk": "+10:00",
+  "Pacific/Wake": "+12:00",
+  "Pacific/Wallis": "+12:00",
+  "Pacific/Yap": "+10:00",
+  Poland: "+01:00",
+  Portugal: "+00:00",
+  PRC: "+08:00",
+  ROC: "+08:00",
+  ROK: "+09:00",
+  Singapore: "+08:00",
+  Turkey: "+02:00",
+  UCT: "+00:00",
+  Universal: "+00:00",
+  "US/Alaska": "-09:00",
+  "US/Aleutian": "-10:00",
+  "US/Arizona": "-07:00",
+  "US/Central": "-06:00",
+  "US/Eastern": "-05:00",
+  "US/East-Indiana": "-05:00",
+  "US/Hawaii": "-10:00",
+  "US/Indiana-Starke": "-06:00",
+  "US/Michigan": "-05:00",
+  "US/Mountain": "-07:00",
+  "US/Pacific": "-08:00",
+  "US/Samoa": "-11:00",
+  UTC: "+00:00",
+  "W-SU": "+03:00",
+  Zulu: "+00:00",
 };
 
 export type timezone = keyof typeof tzDatabase;
diff --git a/src/common/trace.ts b/src/common/trace.ts
new file mode 100644
index 000000000..1b97afee7
--- /dev/null
+++ b/src/common/trace.ts
@@ -0,0 +1,82 @@
+import { AsyncLocalStorage } from "async_hooks";
+
+/* @internal */
+export const traceContext = new AsyncLocalStorage<TraceContext>();
+
+export interface TraceContext {
+  version: string;
+  traceId: string;
+  parentId: string;
+  sample: boolean;
+}
+
+/**
+ * A regex to match the Cloud Trace header.
+ *   - ([A-Fa-f0-9]{32}): The trace id, a 32 character hex value. (e.g. 4bf92f3577b34da6a3ce929d0e0e4736)
+ *   - ([0-9]+): The parent span id, a 64 bit integer. (e.g. 00f067aa0ba902b7)
+ *   - (?:;o=([0-3])): The trace mask, 1-3 denote it should be traced.
+ */
+const CLOUD_TRACE_REGEX = new RegExp(
+  "^(?<traceId>[A-Fa-f0-9]{32})/" + "(?<parentIdInt>[0-9]+)" + "(?:;o=(?<traceMask>[0-3]))?$"
+);
+const CLOUD_TRACE_HEADER = "X-Cloud-Trace-Context";
+
+function matchCloudTraceHeader(carrier: unknown): TraceContext | undefined {
+  let header: unknown = carrier?.[CLOUD_TRACE_HEADER];
+  if (!header) {
+    // try lowercase header
+    header = carrier?.[CLOUD_TRACE_HEADER.toLowerCase()];
+  }
+  if (header && typeof header === "string") {
+    const matches = CLOUD_TRACE_REGEX.exec(header);
+    if (matches && matches.groups) {
+      const { traceId, parentIdInt, traceMask } = matches.groups;
+      // Convert parentId from unsigned int to hex
+      const parentId = parseInt(parentIdInt);
+      if (isNaN(parentId)) {
+        // Ignore traces with invalid parentIds
+        return;
+      }
+      const sample = !!traceMask && traceMask !== "0";
+      return { traceId, parentId: parentId.toString(16), sample, version: "00" };
+    }
+  }
+}
+
+/**
+ * A regex to match the traceparent header.
+ *   - ^([a-f0-9]{2}): The specification version (e.g. 00)
+ *   - ([a-f0-9]{32}): The trace id, a 16-byte array. (e.g. 4bf92f3577b34da6a3ce929d0e0e4736)
+ *   - ([a-f0-9]{16}): The parent span id, an 8-byte array. (e.g. 00f067aa0ba902b7)
+ *   - ([a-f0-9]{2}: The sampled flag. (e.g. 00)
+ */
+const TRACEPARENT_REGEX = new RegExp(
+  "^(?<version>[a-f0-9]{2})-" +
+    "(?<traceId>[a-f0-9]{32})-" +
+    "(?<parentId>[a-f0-9]{16})-" +
+    "(?<flag>[a-f0-9]{2})$"
+);
+const TRACEPARENT_HEADER = "traceparent";
+
+function matchTraceparentHeader(carrier: unknown): TraceContext | undefined {
+  const header: unknown = carrier?.[TRACEPARENT_HEADER];
+  if (header && typeof header === "string") {
+    const matches = TRACEPARENT_REGEX.exec(header);
+    if (matches && matches.groups) {
+      const { version, traceId, parentId, flag } = matches.groups;
+      const sample = flag === "01";
+      return { traceId, parentId, sample, version };
+    }
+  }
+}
+
+/**
+ * Extracts trace context from given carrier object, if any.
+ *
+ * Supports Cloud Trace and traceparent format.
+ *
+ * @param carrier
+ */
+export function extractTraceContext(carrier: unknown): TraceContext | undefined {
+  return matchCloudTraceHeader(carrier) || matchTraceparentHeader(carrier);
+}
diff --git a/src/utilities/assertions.ts b/src/common/utilities/assertions.ts
similarity index 79%
rename from src/utilities/assertions.ts
rename to src/common/utilities/assertions.ts
index 982ca304d..f63b08eca 100644
--- a/src/utilities/assertions.ts
+++ b/src/common/utilities/assertions.ts
@@ -10,7 +10,5 @@
  * @param x A value of type `never`.
  */
 export function assertNever(x: never): never {
-  throw new Error(
-    `Unhandled discriminated union member: ${JSON.stringify(x)}.`
-  );
+  throw new Error(`Unhandled discriminated union member: ${JSON.stringify(x)}.`);
 }
diff --git a/src/encoder.ts b/src/common/utilities/encoder.ts
similarity index 97%
rename from src/encoder.ts
rename to src/common/utilities/encoder.ts
index c13d33808..ecdc86550 100644
--- a/src/encoder.ts
+++ b/src/common/utilities/encoder.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 export function dateToTimestampProto(timeString?: string) {
-  if (typeof timeString === 'undefined') {
+  if (typeof timeString === "undefined") {
     return;
   }
   const date = new Date(timeString);
diff --git a/src/utilities/path-pattern.ts b/src/common/utilities/path-pattern.ts
similarity index 80%
rename from src/utilities/path-pattern.ts
rename to src/common/utilities/path-pattern.ts
index dadc96bb1..8548a850f 100644
--- a/src/utilities/path-pattern.ts
+++ b/src/common/utilities/path-pattern.ts
@@ -20,24 +20,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { pathParts } from './path';
+import { pathParts } from "./path";
 
 /** https://cloud.google.com/eventarc/docs/path-patterns */
 
 /** @hidden */
-const WILDCARD_CAPTURE_REGEX = new RegExp('{[^/{}]+}', 'g');
+const WILDCARD_CAPTURE_REGEX = new RegExp("{[^/{}]+}", "g");
 
 /** @internal */
 export function trimParam(param: string) {
   const paramNoBraces = param.slice(1, -1);
-  if (paramNoBraces.includes('=')) {
-    return paramNoBraces.slice(0, paramNoBraces.indexOf('='));
+  if (paramNoBraces.includes("=")) {
+    return paramNoBraces.slice(0, paramNoBraces.indexOf("="));
   }
   return paramNoBraces;
 }
 
 /** @hidden */
-type SegmentName = 'segment' | 'single-capture' | 'multi-capture';
+type SegmentName = "segment" | "single-capture" | "multi-capture";
 
 /** @hidden */
 interface PathSegment {
@@ -50,22 +50,22 @@ interface PathSegment {
 
 /** @hidden */
 class Segment implements PathSegment {
-  readonly name = 'segment';
+  readonly name = "segment";
   readonly trimmed: string;
   constructor(readonly value: string) {
     this.trimmed = value;
   }
   isSingleSegmentWildcard(): boolean {
-    return this.value.includes('*') && !this.isMultiSegmentWildcard();
+    return this.value.includes("*") && !this.isMultiSegmentWildcard();
   }
   isMultiSegmentWildcard(): boolean {
-    return this.value.includes('**');
+    return this.value.includes("**");
   }
 }
 
 /** @hidden */
 class SingleCaptureSegment implements PathSegment {
-  readonly name = 'single-capture';
+  readonly name = "single-capture";
   readonly trimmed: string;
   constructor(readonly value: string) {
     this.trimmed = trimParam(value);
@@ -80,7 +80,7 @@ class SingleCaptureSegment implements PathSegment {
 
 /** @hidden */
 class MultiCaptureSegment implements PathSegment {
-  readonly name = 'multi-capture';
+  readonly name = "multi-capture";
   readonly trimmed: string;
   constructor(readonly value: string) {
     this.trimmed = trimParam(value);
@@ -99,7 +99,10 @@ class MultiCaptureSegment implements PathSegment {
  */
 export class PathPattern {
   /** @throws on validation error */
-  static compile(rawPath: string) {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  static compile(rawPath: string) {
+    return undefined;
+  }
   private segments: PathSegment[];
 
   constructor(private raw: string) {
@@ -114,15 +117,13 @@ export class PathPattern {
   // If false, we don't need to use pathPattern as our eventarc match type.
   hasWildcards(): boolean {
     return this.segments.some(
-      (segment) =>
-        segment.isSingleSegmentWildcard() || segment.isMultiSegmentWildcard()
+      (segment) => segment.isSingleSegmentWildcard() || segment.isMultiSegmentWildcard()
     );
   }
 
   hasCaptures(): boolean {
     return this.segments.some(
-      (segment) =>
-        segment.name == 'single-capture' || segment.name === 'multi-capture'
+      (segment) => segment.name === "single-capture" || segment.name === "multi-capture"
     );
   }
 
@@ -142,12 +143,10 @@ export class PathPattern {
       const segment = this.segments[segmentNdx];
       const remainingSegments = this.segments.length - 1 - segmentNdx;
       const nextPathNdx = pathSegments.length - remainingSegments;
-      if (segment.name === 'single-capture') {
+      if (segment.name === "single-capture") {
         matches[segment.trimmed] = pathSegments[pathNdx];
-      } else if (segment.name === 'multi-capture') {
-        matches[segment.trimmed] = pathSegments
-          .slice(pathNdx, nextPathNdx)
-          .join('/');
+      } else if (segment.name === "multi-capture") {
+        matches[segment.trimmed] = pathSegments.slice(pathNdx, nextPathNdx).join("/");
       }
       pathNdx = segment.isMultiSegmentWildcard() ? nextPathNdx : pathNdx + 1;
     }
@@ -161,7 +160,7 @@ export class PathPattern {
       let segment: PathSegment;
       const capture = part.match(WILDCARD_CAPTURE_REGEX);
       if (capture && capture.length === 1) {
-        segment = part.includes('**')
+        segment = part.includes("**")
           ? new MultiCaptureSegment(part)
           : new SingleCaptureSegment(part);
       } else {
diff --git a/src/utilities/path.ts b/src/common/utilities/path.ts
similarity index 74%
rename from src/utilities/path.ts
rename to src/common/utilities/path.ts
index 33e187f9e..6b56450b6 100644
--- a/src/utilities/path.ts
+++ b/src/common/utilities/path.ts
@@ -5,9 +5,9 @@
  */
 export function normalizePath(path: string): string {
   if (!path) {
-    return '';
+    return "";
   }
-  return path.replace(/^\//, '').replace(/\/$/, '');
+  return path.replace(/^\//, "").replace(/\/$/, "");
 }
 
 /**
@@ -16,10 +16,10 @@ export function normalizePath(path: string): string {
  * @param path A path to split, in POSIX format.
  */
 export function pathParts(path: string): string[] {
-  if (!path || path === '' || path === '/') {
+  if (!path || path === "" || path === "/") {
     return [];
   }
-  return normalizePath(path).split('/');
+  return normalizePath(path).split("/");
 }
 
 /**
@@ -29,7 +29,5 @@ export function pathParts(path: string): string[] {
  * @param child A second path segment, in POSIX format.
  */
 export function joinPath(base: string, child: string) {
-  return pathParts(base)
-    .concat(pathParts(child))
-    .join('/');
+  return pathParts(base).concat(pathParts(child)).join("/");
 }
diff --git a/spec/v1/setup.spec.ts b/src/common/utilities/utils.ts
similarity index 58%
rename from spec/v1/setup.spec.ts
rename to src/common/utilities/utils.ts
index 25a6fbe0c..0bcfc1ad1 100644
--- a/spec/v1/setup.spec.ts
+++ b/src/common/utilities/utils.ts
@@ -20,31 +20,33 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { expect } from 'chai';
-import { setup } from '../../src/setup';
+function isObject(obj: any): boolean {
+  return typeof obj === "object" && !!obj;
+}
 
-describe('setup()', () => {
-  afterEach(() => {
-    delete process.env.FIREBASE_CONFIG;
-    delete process.env.GCLOUD_PROJECT;
-  });
+/** @hidden */
+export function applyChange(src: any, dest: any) {
+  // if not mergeable, don't merge
+  if (!isObject(dest) || !isObject(src)) {
+    return dest;
+  }
 
-  it('sets GCLOUD_PROJECT from FIREBASE_CONFIG', () => {
-    const testProject = 'test-project';
-    process.env.FIREBASE_CONFIG = JSON.stringify({
-      projectId: testProject,
-    });
-    setup();
-    expect(process.env.GCLOUD_PROJECT).to.equal(testProject);
-  });
+  return merge(src, dest);
+}
 
-  it('does not set GCLOUD_PROJECT if already defined', () => {
-    const existingProject = 'test-project';
-    process.env.GCLOUD_PROJECT = existingProject;
-    process.env.FIREBASE_CONFIG = JSON.stringify({
-      projectId: 'new-project',
-    });
-    setup();
-    expect(process.env.GCLOUD_PROJECT).to.equal(existingProject);
-  });
-});
+function merge(src: Record<string, any>, dest: Record<string, any>): Record<string, any> {
+  const res: Record<string, any> = {};
+  const keys = new Set([...Object.keys(src), ...Object.keys(dest)]);
+
+  for (const key of keys.values()) {
+    if (key in dest) {
+      if (dest[key] === null) {
+        continue;
+      }
+      res[key] = applyChange(src[key], dest[key]);
+    } else if (src[key] !== null) {
+      res[key] = src[key];
+    }
+  }
+  return res;
+}
diff --git a/src/config.ts b/src/config.ts
deleted file mode 100644
index 01ca3a4cc..000000000
--- a/src/config.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2017 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-import * as fs from 'fs';
-import * as path from 'path';
-
-import * as firebase from 'firebase-admin';
-
-export function config(): config.Config {
-  // K_CONFIGURATION is only set in GCFv2
-  if (process.env.K_CONFIGURATION) {
-    throw new Error(
-      'functions.config() is no longer available in Cloud Functions for ' +
-        'Firebase v2. Please see the latest documentation for information ' +
-        'on how to transition to using environment variables'
-    );
-  }
-  if (typeof config.singleton === 'undefined') {
-    init();
-  }
-  return config.singleton;
-}
-
-/**
- * Store and retrieve project configuration data such as third-party API
- * keys or other settings. You can set configuration values using the
- * Firebase CLI as described in
- * [Environment Configuration](/docs/functions/config-env).
- */
-export namespace config {
-  /**
-   * The Functions configuration interface.
-   *
-   * Access via `functions.config()`.
-   */
-  export interface Config {
-    [key: string]: any;
-  }
-
-  /** @hidden */
-  export let singleton: config.Config;
-}
-
-/** @hidden */
-export let firebaseConfigCache: firebase.AppOptions | null = null;
-
-/** @hidden */
-export function firebaseConfig(): firebase.AppOptions | null {
-  if (firebaseConfigCache) {
-    return firebaseConfigCache;
-  }
-
-  let env = process.env.FIREBASE_CONFIG;
-  if (env) {
-    // Firebase Tools will always use a JSON blob in prod, but docs
-    // explicitly state that the user can set the env to a file:
-    // https://firebase.google.com/docs/admin/setup#initialize-without-parameters
-    if (!env.startsWith('{')) {
-      env = fs.readFileSync(path.join(process.env.PWD, env)).toString('utf8');
-    }
-
-    firebaseConfigCache = JSON.parse(env);
-    return firebaseConfigCache;
-  }
-
-  // Could have Runtime Config with Firebase in it as an ENV value.
-  try {
-    const config = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG);
-    if (config.firebase) {
-      firebaseConfigCache = config.firebase;
-      return firebaseConfigCache;
-    }
-  } catch (e) {
-    // Do nothing
-  }
-
-  // Could have Runtime Config with Firebase in it as an ENV location or default.
-  try {
-    const configPath =
-      process.env.CLOUD_RUNTIME_CONFIG ||
-      path.join(process.cwd(), '.runtimeconfig.json');
-    const contents = fs.readFileSync(configPath);
-    const config = JSON.parse(contents.toString('utf8'));
-    if (config.firebase) {
-      firebaseConfigCache = config.firebase;
-      return firebaseConfigCache;
-    }
-  } catch (e) {
-    // Do nothing
-  }
-
-  return null;
-}
-
-function init() {
-  try {
-    const parsed = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG);
-    delete parsed.firebase;
-    config.singleton = parsed;
-    return;
-  } catch (e) {
-    // Do nothing
-  }
-
-  try {
-    const configPath =
-      process.env.CLOUD_RUNTIME_CONFIG ||
-      path.join(process.cwd(), '.runtimeconfig.json');
-    const contents = fs.readFileSync(configPath);
-    const parsed = JSON.parse(contents.toString('utf8'));
-    delete parsed.firebase;
-    config.singleton = parsed;
-    return;
-  } catch (e) {
-    // Do nothing
-  }
-
-  config.singleton = {};
-}
diff --git a/src/function-configuration.ts b/src/function-configuration.ts
index 6a352e880..e69de29bb 100644
--- a/src/function-configuration.ts
+++ b/src/function-configuration.ts
@@ -1,180 +0,0 @@
-import { Expression } from './v2/params';
-
-/**
- * List of all regions supported by Cloud Functions.
- */
-export const SUPPORTED_REGIONS = [
-  'us-central1',
-  'us-east1',
-  'us-east4',
-  'us-west2',
-  'us-west3',
-  'us-west4',
-  'europe-central2',
-  'europe-west1',
-  'europe-west2',
-  'europe-west3',
-  'europe-west6',
-  'asia-east1',
-  'asia-east2',
-  'asia-northeast1',
-  'asia-northeast2',
-  'asia-northeast3',
-  'asia-south1',
-  'asia-southeast1',
-  'asia-southeast2',
-  'northamerica-northeast1',
-  'southamerica-east1',
-  'australia-southeast1',
-] as const;
-
-/**
- * Cloud Functions min timeout value.
- */
-export const MIN_TIMEOUT_SECONDS = 0;
-
-/**
- * Cloud Functions max timeout value.
- */
-export const MAX_TIMEOUT_SECONDS = 540;
-
-/**
- * List of available memory options supported by Cloud Functions.
- */
-export const VALID_MEMORY_OPTIONS = [
-  '128MB',
-  '256MB',
-  '512MB',
-  '1GB',
-  '2GB',
-  '4GB',
-  '8GB',
-] as const;
-
-/**
- * List of available options for VpcConnectorEgressSettings.
- */
-export const VPC_EGRESS_SETTINGS_OPTIONS = [
-  'VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED',
-  'PRIVATE_RANGES_ONLY',
-  'ALL_TRAFFIC',
-] as const;
-
-/**
- * List of available options for IngressSettings.
- */
-export const INGRESS_SETTINGS_OPTIONS = [
-  'INGRESS_SETTINGS_UNSPECIFIED',
-  'ALLOW_ALL',
-  'ALLOW_INTERNAL_ONLY',
-  'ALLOW_INTERNAL_AND_GCLB',
-] as const;
-
-/**
- * Scheduler retry options. Applies only to scheduled functions.
- */
-export interface ScheduleRetryConfig {
-  retryCount?: number | Expression<number> | null;
-  maxRetryDuration?: string | Expression<string> | null;
-  minBackoffDuration?: string | Expression<string> | null;
-  maxBackoffDuration?: string | Expression<string> | null;
-  maxDoublings?: number | Expression<number> | null;
-}
-
-/**
- * Configuration options for scheduled functions.
- */
-export interface Schedule {
-  schedule: string;
-  timeZone?: string;
-  retryConfig?: ScheduleRetryConfig;
-}
-
-export interface FailurePolicy {
-  retry: {};
-}
-
-export const DEFAULT_FAILURE_POLICY: FailurePolicy = {
-  retry: {},
-};
-
-export const MAX_NUMBER_USER_LABELS = 58;
-
-export interface RuntimeOptions {
-  /**
-   * Which platform should host the backend. Valid options are "gcfv1"
-   * @hidden
-   */
-  platform?: 'gcfv1';
-
-  /**
-   * Failure policy of the function, with boolean `true` being equivalent to
-   * providing an empty retry object.
-   */
-  failurePolicy?: FailurePolicy | boolean;
-  /**
-   * Amount of memory to allocate to the function.
-   */
-  memory?: typeof VALID_MEMORY_OPTIONS[number];
-  /**
-   * Timeout for the function in seconds, possible values are 0 to 540.
-   */
-  timeoutSeconds?: number;
-
-  /**
-   * Min number of actual instances to be running at a given time.
-   * Instances will be billed for memory allocation and 10% of CPU allocation
-   * while idle.
-   */
-  minInstances?: number;
-
-  /**
-   * Max number of actual instances allowed to be running in parallel.
-   */
-  maxInstances?: number;
-
-  /**
-   * Connect cloud function to specified VPC connector.
-   */
-  vpcConnector?: string;
-
-  /**
-   * Egress settings for VPC connector.
-   */
-  vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number];
-
-  /**
-   * Specific service account for the function to run as.
-   */
-  serviceAccount?: 'default' | string;
-
-  /**
-   * Ingress settings which control where this function can be called from.
-   */
-  ingressSettings?: typeof INGRESS_SETTINGS_OPTIONS[number];
-
-  /**
-   * User labels to set on the function.
-   */
-  labels?: Record<string, string>;
-
-  /**
-   * Invoker to set access control on https functions.
-   */
-  invoker?: 'public' | 'private' | string | string[];
-
-  /*
-   * Allow requests with invalid App Check tokens on callable functions.
-   */
-  allowInvalidAppCheckToken?: boolean;
-
-  /*
-   * Secrets to bind to a function instance.
-   */
-  secrets?: string[];
-}
-
-export interface DeploymentOptions extends RuntimeOptions {
-  regions?: Array<typeof SUPPORTED_REGIONS[number] | string>;
-  schedule?: Schedule;
-}
diff --git a/src/handler-builder.ts b/src/handler-builder.ts
deleted file mode 100644
index c976bf8e6..000000000
--- a/src/handler-builder.ts
+++ /dev/null
@@ -1,379 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2017 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-import * as express from 'express';
-
-import { apps } from './apps';
-import { CloudFunction, EventContext, HttpsFunction } from './cloud-functions';
-import * as analytics from './providers/analytics';
-import * as auth from './providers/auth';
-import * as database from './providers/database';
-import * as firestore from './providers/firestore';
-import * as https from './providers/https';
-import * as pubsub from './providers/pubsub';
-import * as remoteConfig from './providers/remoteConfig';
-import * as storage from './providers/storage';
-import * as tasks from './providers/tasks';
-import * as testLab from './providers/testLab';
-
-/**
- * The `HandlerBuilder` class facilitates the writing of functions by developers
- * building Firebase Extensions as well as developers who want to use the gcloud CLI or
- * Google Cloud Console to deploy their functions.
- *
- * **Do not use `HandlerBuilder` when writing normal functions for deployment via
- * the Firebase CLI.** For normal purposes, use
- * [`FunctionBuilder`](/docs/reference/functions/function_builder_.functionbuilder).
- */
-export class HandlerBuilder {
-  constructor() {}
-
-  /**
-   * Create a handler for HTTPS events.
-
-   * `onRequest` handles an HTTPS request and has the same signature as an Express app.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.https.onRequest((req, res) => { ... })
-   * ```
-   *
-   * `onCall` declares a callable function for clients to call using a Firebase SDK.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.https.onCall((data, context) => { ... })
-   * ```
-   */
-  get https() {
-    return {
-      onRequest: (
-        handler: (req: express.Request, resp: express.Response) => void
-      ): HttpsFunction => {
-        const func = https._onRequestWithOptions(handler, {});
-        func.__trigger = {};
-        func.__endpoint = undefined;
-        func.__requiredAPIs = undefined;
-        return func;
-      },
-      onCall: (
-        handler: (
-          data: any,
-          context: https.CallableContext
-        ) => any | Promise<any>
-      ): HttpsFunction => {
-        const func = https._onCallWithOptions(handler, {});
-        func.__trigger = {};
-        func.__endpoint = undefined;
-        func.__requiredAPIs = undefined;
-        return func;
-      },
-    };
-  }
-
-  /**
-   * Create a handler for tasks functions.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.tasks.onDispatch((data, context) => { ... })
-   * ```
-   */
-  /** @hidden */
-  get tasks() {
-    return {
-      get taskQueue() {
-        return {
-          onDispatch: (
-            handler: (
-              data: any,
-              context: tasks.TaskContext
-            ) => void | Promise<void>
-          ): HttpsFunction => {
-            const builder = new tasks.TaskQueueBuilder();
-            const func = builder.onDispatch(handler);
-            func.__trigger = {};
-            func.__endpoint = undefined;
-            func.__requiredAPIs = undefined;
-            return func;
-          },
-        };
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Firebase Realtime Database events.
-   *
-   * `ref.onCreate` handles the creation of new data.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.database.ref.onCreate((snap, context) => { ... })
-   * ```
-   *
-   * `ref.onUpdate` handles updates to existing data.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.database.ref.onUpdate((change, context) => { ... })
-   * ```
-
-   * `ref.onDelete` handles the deletion of existing data.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.database.ref.onDelete((snap, context) => { ... })
-   * ```
-
-   * `ref.onWrite` handles the creation, update, or deletion of data.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.database.ref.onWrite((change, context) => { ... })
-   * ```
-   */
-  get database() {
-    return {
-      /** @hidden */
-      get instance() {
-        return {
-          get ref() {
-            return new database.RefBuilder(apps(), () => null, {});
-          },
-        };
-      },
-      get ref() {
-        return new database.RefBuilder(apps(), () => null, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Cloud Firestore events.
-   *
-   * `document.onCreate` handles the creation of new documents.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.firestore.document.onCreate((snap, context) => { ... })
-   * ```
-
-   * `document.onUpdate` handles updates to existing documents.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.firestore.document.onUpdate((change, context) => { ... })
-   * ```
-
-   * `document.onDelete` handles the deletion of existing documents.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.firestore.document.onDelete((snap, context) =>
-   * { ... })
-   * ```
-
-   * `document.onWrite` handles the creation, update, or deletion of documents.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.firestore.document.onWrite((change, context) =>
-   * { ... })
-   * ```
-   */
-  get firestore() {
-    return {
-      get document() {
-        return new firestore.DocumentBuilder(() => null, {});
-      },
-      /** @hidden */
-      get namespace() {
-        return new firestore.DocumentBuilder(() => null, {});
-      },
-      /** @hidden */
-      get database() {
-        return new firestore.DocumentBuilder(() => null, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Firebase Remote Config events.
-
-   * `remoteConfig.onUpdate` handles events that update a Remote Config template.
-
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.remoteConfig.onUpdate() => { ... })
-   * ```
-   */
-  get remoteConfig() {
-    return {
-      onUpdate: (
-        handler: (
-          version: remoteConfig.TemplateVersion,
-          context: EventContext
-        ) => PromiseLike<any> | any
-      ): CloudFunction<remoteConfig.TemplateVersion> => {
-        return new remoteConfig.UpdateBuilder(() => null, {}).onUpdate(handler);
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Google Analytics events.
-
-   * `event.onLog` handles the logging of Analytics conversion events.
-
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.analytics.event.onLog((event) => { ... })
-   * ```
-   */
-  get analytics() {
-    return {
-      get event() {
-        return new analytics.AnalyticsEventBuilder(() => null, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Cloud Storage for Firebase events.
-   *
-   * `object.onArchive` handles the archiving of Storage objects.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.storage.object.onArchive((object) => { ... })
-   * ```
-
-   * `object.onDelete` handles the deletion of Storage objects.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.storage.object.onDelete((object) => { ... })
-   * ```
-
-   * `object.onFinalize` handles the creation of Storage objects.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.storage.object.onFinalize((object) =>
-   * { ... })
-   * ```
-
-   * `object.onMetadataUpdate` handles changes to the metadata of existing Storage objects.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.storage.object.onMetadataUpdate((object) =>
-   * { ... })
-   * ```
-   */
-  get storage() {
-    return {
-      get bucket() {
-        return new storage.BucketBuilder(() => null, {}).object();
-      },
-
-      get object() {
-        return new storage.ObjectBuilder(() => null, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Cloud Pub/Sub events.
-   *
-   * `topic.onPublish` handles messages published to a Pub/Sub topic from SDKs, Cloud Console, or gcloud CLI.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.pubsub.topic.onPublish((message) => { ... })
-   * ```
-
-   * `schedule.onPublish` handles messages published to a Pub/Sub topic on a schedule.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.pubsub.schedule.onPublish((message) => { ... })
-   * ```
-   */
-  get pubsub() {
-    return {
-      get topic() {
-        return new pubsub.TopicBuilder(() => null, {});
-      },
-      get schedule() {
-        return new pubsub.ScheduleBuilder(() => null, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Firebase Authentication events.
-   *
-   * `user.onCreate` handles the creation of users.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.auth.user.onCreate((user) => { ... })
-   * ```
-
-   * `user.onDelete` handles the deletion of users.
-   *
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.auth.user.onDelete((user => { ... })
-   * ```
-
-   */
-  get auth() {
-    return {
-      get user() {
-        return new auth.UserBuilder(() => null, {}, {});
-      },
-    };
-  }
-
-  /**
-   * Create a handler for Firebase Test Lab events.
-
-   * `testMatrix.onComplete` handles the completion of a test matrix.
-
-   * @example
-   * ```javascript
-   * exports.myFunction = functions.handler.testLab.testMatrix.onComplete((testMatrix) => { ... })
-   * ```
-   */
-  get testLab() {
-    return {
-      get testMatrix() {
-        return new testLab.TestMatrixBuilder(() => null, {});
-      },
-    };
-  }
-}
-
-export let handler = new HandlerBuilder();
diff --git a/src/logger/common.ts b/src/logger/common.ts
index 020883bbb..32ef0e596 100644
--- a/src/logger/common.ts
+++ b/src/logger/common.ts
@@ -20,25 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-// Determine if structured logs are supported (node >= 10). If something goes wrong,
-// assume no since unstructured is safer.
-/** @hidden */
-export const SUPPORTS_STRUCTURED_LOGS =
-  parseInt(process.versions?.node?.split('.')?.[0] || '8', 10) >= 10;
-
 // Map LogSeverity types to their equivalent `console.*` method.
 /** @hidden */
 export const CONSOLE_SEVERITY: {
-  [severity: string]: 'debug' | 'info' | 'warn' | 'error';
+  [severity: string]: "debug" | "info" | "warn" | "error";
 } = {
-  DEBUG: 'debug',
-  INFO: 'info',
-  NOTICE: 'info',
-  WARNING: 'warn',
-  ERROR: 'error',
-  CRITICAL: 'error',
-  ALERT: 'error',
-  EMERGENCY: 'error',
+  DEBUG: "debug",
+  INFO: "info",
+  NOTICE: "info",
+  WARNING: "warn",
+  ERROR: "error",
+  CRITICAL: "error",
+  ALERT: "error",
+  EMERGENCY: "error",
 };
 
 // safely preserve unpatched console.* methods in case of compat require
diff --git a/src/logger/compat.ts b/src/logger/compat.ts
index 7300a197b..02b819ddc 100644
--- a/src/logger/compat.ts
+++ b/src/logger/compat.ts
@@ -20,30 +20,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { format } from 'util';
-import {
-  CONSOLE_SEVERITY,
-  SUPPORTS_STRUCTURED_LOGS,
-  UNPATCHED_CONSOLE,
-} from './common';
+import { format } from "util";
+import { CONSOLE_SEVERITY, UNPATCHED_CONSOLE } from "./common";
 
 /** @hidden */
 function patchedConsole(severity: string): (data: any, ...args: any[]) => void {
-  return function(data: any, ...args: any[]): void {
-    if (SUPPORTS_STRUCTURED_LOGS) {
-      UNPATCHED_CONSOLE[CONSOLE_SEVERITY[severity]](
-        JSON.stringify({ severity, message: format(data, ...args) })
-      );
-      return;
+  return function (data: any, ...args: any[]): void {
+    let message = format(data, ...args);
+    if (severity === "ERROR") {
+      message = new Error(message).stack || message;
     }
 
-    UNPATCHED_CONSOLE[CONSOLE_SEVERITY[severity]](data, ...args);
+    UNPATCHED_CONSOLE[CONSOLE_SEVERITY[severity]](JSON.stringify({ severity, message }));
   };
 }
 
 // IMPORTANT -- "../logger" must be imported before monkeypatching!
-console.debug = patchedConsole('DEBUG');
-console.info = patchedConsole('INFO');
-console.log = patchedConsole('INFO');
-console.warn = patchedConsole('WARNING');
-console.error = patchedConsole('ERROR');
+console.debug = patchedConsole("DEBUG");
+console.info = patchedConsole("INFO");
+console.log = patchedConsole("INFO");
+console.warn = patchedConsole("WARNING");
+console.error = patchedConsole("ERROR");
diff --git a/src/logger/index.ts b/src/logger/index.ts
index 02750f845..e50e5088a 100644
--- a/src/logger/index.ts
+++ b/src/logger/index.ts
@@ -20,27 +20,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { format } from 'util';
+import { format } from "util";
+import { traceContext } from "../common/trace";
 
-import {
-  CONSOLE_SEVERITY,
-  SUPPORTS_STRUCTURED_LOGS,
-  UNPATCHED_CONSOLE,
-} from './common';
+import { CONSOLE_SEVERITY, UNPATCHED_CONSOLE } from "./common";
 
 /**
  * `LogSeverity` indicates the detailed severity of the log entry. See [LogSeverity](https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#logseverity).
  * @public
  */
 export type LogSeverity =
-  | 'DEBUG'
-  | 'INFO'
-  | 'NOTICE'
-  | 'WARNING'
-  | 'ERROR'
-  | 'CRITICAL'
-  | 'ALERT'
-  | 'EMERGENCY';
+  | "DEBUG"
+  | "INFO"
+  | "NOTICE"
+  | "WARNING"
+  | "ERROR"
+  | "CRITICAL"
+  | "ALERT"
+  | "EMERGENCY";
 
 /**
  * `LogEntry` represents a [structured Cloud Logging](https://cloud.google.com/logging/docs/structured-logging)
@@ -56,7 +53,7 @@ export interface LogEntry {
 
 /** @internal */
 function removeCircular(obj: any, refs: any[] = []): any {
-  if (typeof obj !== 'object' || !obj) {
+  if (typeof obj !== "object" || !obj) {
     return obj;
   }
   // If the object defines its own toJSON, prefer that.
@@ -64,7 +61,7 @@ function removeCircular(obj: any, refs: any[] = []): any {
     return obj.toJSON();
   }
   if (refs.includes(obj)) {
-    return '[Circular]';
+    return "[Circular]";
   } else {
     refs.push(obj);
   }
@@ -76,7 +73,7 @@ function removeCircular(obj: any, refs: any[] = []): any {
   }
   for (const k in obj) {
     if (refs.includes(obj[k])) {
-      returnObj[k] = '[Circular]';
+      returnObj[k] = "[Circular]";
     } else {
       returnObj[k] = removeCircular(obj[k], refs);
     }
@@ -90,30 +87,7 @@ function removeCircular(obj: any, refs: any[] = []): any {
  * @public
  */
 export function write(entry: LogEntry) {
-  if (SUPPORTS_STRUCTURED_LOGS) {
-    UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](
-      JSON.stringify(removeCircular(entry))
-    );
-    return;
-  }
-
-  let message = entry.message || '';
-  const jsonPayload: { [key: string]: any } = {};
-  let jsonKeyCount = 0;
-  for (const k in entry) {
-    if (!['severity', 'message'].includes(k)) {
-      jsonKeyCount++;
-      jsonPayload[k] = entry[k];
-    }
-  }
-  if (jsonKeyCount > 0) {
-    message = `${message} ${JSON.stringify(
-      removeCircular(jsonPayload),
-      null,
-      2
-    )}`;
-  }
-  UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](message);
+  UNPATCHED_CONSOLE[CONSOLE_SEVERITY[entry.severity]](JSON.stringify(removeCircular(entry)));
 }
 
 /**
@@ -123,7 +97,7 @@ export function write(entry: LogEntry) {
  * @public
  */
 export function debug(...args: any[]) {
-  write(entryFromArgs('DEBUG', args));
+  write(entryFromArgs("DEBUG", args));
 }
 
 /**
@@ -133,7 +107,7 @@ export function debug(...args: any[]) {
  * @public
  */
 export function log(...args: any[]) {
-  write(entryFromArgs('INFO', args));
+  write(entryFromArgs("INFO", args));
 }
 
 /**
@@ -143,7 +117,7 @@ export function log(...args: any[]) {
  * @public
  */
 export function info(...args: any[]) {
-  write(entryFromArgs('INFO', args));
+  write(entryFromArgs("INFO", args));
 }
 
 /**
@@ -153,7 +127,7 @@ export function info(...args: any[]) {
  * @public
  */
 export function warn(...args: any[]) {
-  write(entryFromArgs('WARNING', args));
+  write(entryFromArgs("WARNING", args));
 }
 
 /**
@@ -163,19 +137,29 @@ export function warn(...args: any[]) {
  * @public
  */
 export function error(...args: any[]) {
-  write(entryFromArgs('ERROR', args));
+  write(entryFromArgs("ERROR", args));
 }
 
 /** @hidden */
 function entryFromArgs(severity: LogSeverity, args: any[]): LogEntry {
   let entry = {};
   const lastArg = args[args.length - 1];
-  if (lastArg && typeof lastArg == 'object' && lastArg.constructor == Object) {
+  if (lastArg && typeof lastArg === "object" && lastArg.constructor === Object) {
     entry = args.pop();
   }
-  return Object.assign({}, entry, {
+  const ctx = traceContext.getStore();
+
+  // mimic `console.*` behavior, see https://nodejs.org/api/console.html#console_console_log_data_args
+  let message = format(...args);
+  if (severity === "ERROR" && !args.find((arg) => arg instanceof Error)) {
+    message = new Error(message).stack || message;
+  }
+  return {
+    "logging.googleapis.com/trace": ctx?.traceId
+      ? `projects/${process.env.GCLOUD_PROJECT}/traces/${ctx.traceId}`
+      : undefined,
+    ...entry,
     severity,
-    // mimic `console.*` behavior, see https://nodejs.org/api/console.html#console_console_log_data_args
-    message: format.apply(null, args),
-  });
+    message,
+  };
 }
diff --git a/src/v2/params/index.ts b/src/params/index.ts
similarity index 69%
rename from src/v2/params/index.ts
rename to src/params/index.ts
index b638d68a5..5fb0b9c35 100644
--- a/src/v2/params/index.ts
+++ b/src/params/index.ts
@@ -30,12 +30,12 @@ import {
   Expression,
   FloatParam,
   IntParam,
-  ListParam,
   Param,
   ParamOptions,
   SecretParam,
   StringParam,
-} from './types';
+  InternalExpression,
+} from "./types";
 
 export { ParamOptions, Expression };
 
@@ -64,6 +64,40 @@ export function clearParams() {
   declaredParams.splice(0, declaredParams.length);
 }
 
+/**
+ * A builtin param that resolves to the default RTDB database URL associated
+ * with the project, without prompting the deployer. Empty string if none exists.
+ */
+export const databaseURL: Param<string> = new InternalExpression(
+  "DATABASE_URL",
+  (env: NodeJS.ProcessEnv) => JSON.parse(env.FIREBASE_CONFIG)?.databaseURL || ""
+);
+/**
+ * A builtin param that resolves to the Cloud project ID associated with
+ * the project, without prompting the deployer.
+ */
+export const projectID: Param<string> = new InternalExpression(
+  "PROJECT_ID",
+  (env: NodeJS.ProcessEnv) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || ""
+);
+/**
+ * A builtin param that resolves to the Cloud project ID, without prompting
+ * the deployer.
+ */
+export const gcloudProject: Param<string> = new InternalExpression(
+  "GCLOUD_PROJECT",
+  (env: NodeJS.ProcessEnv) => JSON.parse(env.FIREBASE_CONFIG)?.projectId || ""
+);
+/**
+ * A builtin param that resolves to the Cloud storage bucket associated
+ * with the function, without prompting the deployer. Empty string if not
+ * defined.
+ */
+export const storageBucket: Param<string> = new InternalExpression(
+  "STORAGE_BUCKET",
+  (env: NodeJS.ProcessEnv) => JSON.parse(env.FIREBASE_CONFIG)?.storageBucket || ""
+);
+
 /**
  * Declares a secret param, that will persist values only in Cloud Secret Manager.
  * Secrets are stored interally as bytestrings. Use ParamOptions.`as` to provide type
@@ -86,10 +120,7 @@ export function defineSecret(name: string): SecretParam {
  * @param options Configuration options for the param.
  * @returns A Param with a `string` return type for `.value`.
  */
-export function defineString(
-  name: string,
-  options: ParamOptions<string> = {}
-): StringParam {
+export function defineString(name: string, options: ParamOptions<string> = {}): StringParam {
   const param = new StringParam(name, options);
   registerParam(param);
   return param;
@@ -102,10 +133,7 @@ export function defineString(
  * @param options Configuration options for the param.
  * @returns A Param with a `boolean` return type for `.value`.
  */
-export function defineBoolean(
-  name: string,
-  options: ParamOptions<boolean> = {}
-): BooleanParam {
+export function defineBoolean(name: string, options: ParamOptions<boolean> = {}): BooleanParam {
   const param = new BooleanParam(name, options);
   registerParam(param);
   return param;
@@ -118,10 +146,7 @@ export function defineBoolean(
  * @param options Configuration options for the param.
  * @returns A Param with a `number` return type for `.value`.
  */
-export function defineInt(
-  name: string,
-  options: ParamOptions<number> = {}
-): IntParam {
+export function defineInt(name: string, options: ParamOptions<number> = {}): IntParam {
   const param = new IntParam(name, options);
   registerParam(param);
   return param;
@@ -134,27 +159,8 @@ export function defineInt(
  * @param options Configuration options for the param.
  * @returns A Param with a `number` return type for `.value`.
  */
-export function defineFloat(
-  name: string,
-  options: ParamOptions<number> = {}
-): FloatParam {
+export function defineFloat(name: string, options: ParamOptions<number> = {}): FloatParam {
   const param = new FloatParam(name, options);
   registerParam(param);
   return param;
 }
-
-/**
- * Declare a list param (array of strings).
- *
- * @param name The name of the environment variable to use to load the param.
- * @param options Configuration options for the param.
- * @returns A Param with a `string[]` return type for `.value`.
- */
-export function defineList(
-  name: string,
-  options: ParamOptions<string[]> = {}
-): ListParam {
-  const param = new ListParam(name, options);
-  registerParam(param);
-  return param;
-}
diff --git a/src/params/types.ts b/src/params/types.ts
new file mode 100644
index 000000000..fccdcbf86
--- /dev/null
+++ b/src/params/types.ts
@@ -0,0 +1,434 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2021 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import * as logger from "../logger";
+
+/*
+ * A CEL expression which can be evaluated during function deployment, and
+ * resolved to a value of the generic type parameter: i.e, you can pass
+ * an Expression<number> as the value of an option that normally accepts numbers.
+ */
+export abstract class Expression<T extends string | number | boolean | string[]> {
+  /** Returns the Expression's runtime value, based on the CLI's resolution of params. */
+  value(): T {
+    if (process.env.FUNCTIONS_CONTROL_API === "true") {
+      logger.warn(
+        `${this.toString()}.value() invoked during function deployment, instead of during runtime.`
+      );
+      logger.warn(
+        `This is usually a mistake. In configs, use Params directly without calling .value().`
+      );
+      logger.warn(`example: { memory: memoryParam } not { memory: memoryParam.value() }`);
+    }
+    return this.runtimeValue();
+  }
+
+  /** @internal */
+  runtimeValue(): T {
+    throw new Error("Not implemented");
+  }
+
+  /** Returns the Expression's representation as a braced CEL expression. */
+  toCEL(): string {
+    return `{{ ${this.toString()} }}`;
+  }
+
+  toJSON(): string {
+    return this.toString();
+  }
+}
+
+function quoteIfString<T extends string | number | boolean | string[]>(literal: T): T {
+  // TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
+  return typeof literal === "string" ? (`"${literal}"` as T) : literal;
+}
+
+function valueOf<T extends string | number | boolean | string[]>(arg: T | Expression<T>): T {
+  return arg instanceof Expression ? arg.runtimeValue() : arg;
+}
+function refOf<T extends string | number | boolean | string[]>(arg: T | Expression<T>): string {
+  return arg instanceof Expression ? arg.toString() : quoteIfString(arg).toString();
+}
+
+/**
+ * A CEL expression corresponding to a ternary operator, e.g {{ cond ? ifTrue : ifFalse }}
+ */
+export class TernaryExpression<
+  T extends string | number | boolean | string[]
+> extends Expression<T> {
+  constructor(
+    private readonly test: Expression<boolean>,
+    private readonly ifTrue: T | Expression<T>,
+    private readonly ifFalse: T | Expression<T>
+  ) {
+    super();
+    this.ifTrue = ifTrue;
+    this.ifFalse = ifFalse;
+  }
+
+  /** @internal */
+  runtimeValue(): T {
+    return this.test.runtimeValue() ? valueOf(this.ifTrue) : valueOf(this.ifFalse);
+  }
+
+  toString() {
+    return `${this.test} ? ${refOf(this.ifTrue)} : ${refOf(this.ifFalse)}`;
+  }
+}
+
+/**
+ * A CEL expression that evaluates to boolean true or false based on a comparison
+ * between the value of another expression and a literal of that same type.
+ */
+export class CompareExpression<
+  T extends string | number | boolean | string[]
+> extends Expression<boolean> {
+  cmp: "==" | "!=" | ">" | ">=" | "<" | "<=";
+  lhs: Expression<T>;
+  rhs: T | Expression<T>;
+
+  constructor(
+    cmp: "==" | "!=" | ">" | ">=" | "<" | "<=",
+    lhs: Expression<T>,
+    rhs: T | Expression<T>
+  ) {
+    super();
+    this.cmp = cmp;
+    this.lhs = lhs;
+    this.rhs = rhs;
+  }
+
+  /** @internal */
+  runtimeValue(): boolean {
+    const left = this.lhs.runtimeValue();
+    const right = valueOf(this.rhs);
+    switch (this.cmp) {
+      case "==":
+        return left === right;
+      case "!=":
+        return left !== right;
+      case ">":
+        return left > right;
+      case ">=":
+        return left >= right;
+      case "<":
+        return left < right;
+      case "<=":
+        return left <= right;
+      default:
+        throw new Error(`Unknown comparator ${this.cmp}`);
+    }
+  }
+
+  toString() {
+    const rhsStr = refOf(this.rhs);
+    return `${this.lhs} ${this.cmp} ${rhsStr}`;
+  }
+
+  /** Returns a TernaryExpression which can resolve to one of two values, based on the resolution of this comparison. */
+  then<retT extends string | number | boolean | string[]>(
+    ifTrue: retT | Expression<retT>,
+    ifFalse: retT | Expression<retT>
+  ) {
+    return new TernaryExpression<retT>(this, ifTrue, ifFalse);
+  }
+}
+
+/** @hidden */
+type ParamValueType = "string" | "list" | "boolean" | "int" | "float" | "secret";
+
+type ParamInput<T> =
+  | { text: TextInput<T> }
+  | { select: SelectInput<T> }
+  | { resource: ResourceInput };
+
+/**
+ * Specifies that a Param's value should be determined by prompting the user
+ * to type it in interactively at deploy-time. Input that does not match the
+ * provided validationRegex, if present, will be retried.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export interface TextInput<T = unknown> {
+  example?: string;
+  /**
+   * A regular expression (or an escaped string to compile into a regular
+   * expression) which the prompted text must satisfy; the prompt will retry
+   * until input matching the regex is provided.
+   */
+  validationRegex?: string | RegExp;
+  /**
+   * A custom error message to display when retrying the prompt based on input
+   * failing to conform to the validationRegex,
+   */
+  validationErrorMessage?: string;
+}
+
+/**
+ * Specifies that a Param's value should be determined by having the user
+ * select from a list containing all the project's resources of a certain
+ * type. Currently, only type:"storage.googleapis.com/Bucket" is supported.
+ */
+export interface ResourceInput {
+  resource: {
+    type: string;
+  };
+}
+
+/**
+ * Specifies that a Param's value should be determined by having the user select
+ * from a list of pre-canned options interactively at deploy-time.
+ */
+export interface SelectInput<T = unknown> {
+  options: Array<SelectOptions<T>>;
+}
+
+/**
+ * One of the options provided to a SelectInput, containing a value and
+ * optionally a human-readable label to display in the selection interface.
+ */
+export interface SelectOptions<T = unknown> {
+  label?: string;
+  value: T;
+}
+
+/** The wire representation of a Param when it's sent to the CLI. A superset of ParamOptions. */
+export type ParamSpec<T extends string | number | boolean | string[]> = {
+  /** The name of the parameter which will be stored in .env files. Use UPPERCASE. */
+  name: string;
+  /** An optional default value to be used while prompting for input. Can be a literal or another parametrized expression. */
+  default?: T | Expression<T>;
+  /** An optional human-readable string to be used as a replacement for the Param's name when prompting. */
+  label?: string;
+  /** An optional long-form description of the Param to be displayed while prompting. */
+  description?: string;
+  /** @internal */
+  type: ParamValueType;
+  /** The way in which the Firebase CLI will prompt for the value of this Param. Defaults to a TextInput. */
+  input?: ParamInput<T>;
+};
+
+/**
+ * Representation of parameters for the stack over the wire.
+ *
+ * @remarks
+ * N.B: a WireParamSpec is just a ParamSpec with default expressions converted into a CEL literal
+ *
+ * @alpha
+ */
+export type WireParamSpec<T extends string | number | boolean | string[]> = {
+  name: string;
+  default?: T | string;
+  label?: string;
+  description?: string;
+  type: ParamValueType;
+  input?: ParamInput<T>;
+};
+
+/** Configuration options which can be used to customize the prompting behavior of a Param. */
+export type ParamOptions<T extends string | number | boolean | string[]> = Omit<
+  ParamSpec<T>,
+  "name" | "type"
+>;
+
+/**
+ * Represents a parametrized value that will be read from .env files if present,
+ * or prompted for by the CLI if missing. Instantiate these with the defineX
+ * methods exported by the firebase-functions/params namespace.
+ */
+export abstract class Param<T extends string | number | boolean | string[]> extends Expression<T> {
+  static type: ParamValueType = "string";
+
+  constructor(readonly name: string, readonly options: ParamOptions<T> = {}) {
+    super();
+  }
+
+  /** @internal */
+  runtimeValue(): T {
+    throw new Error("Not implemented");
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  cmp(cmp: "==" | "!=" | ">" | ">=" | "<" | "<=", rhs: T | Expression<T>) {
+    return new CompareExpression<T>(cmp, this, rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  equals(rhs: T | Expression<T>) {
+    return this.cmp("==", rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  notEquals(rhs: T | Expression<T>) {
+    return this.cmp("!=", rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  greaterThan(rhs: T | Expression<T>) {
+    return this.cmp(">", rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  greaterThanOrEqualTo(rhs: T | Expression<T>) {
+    return this.cmp(">=", rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  lessThan(rhs: T | Expression<T>) {
+    return this.cmp("<", rhs);
+  }
+
+  /** Returns a parametrized expression of Boolean type, based on comparing the value of this param to a literal or a different expression. */
+  lessThanorEqualTo(rhs: T | Expression<T>) {
+    return this.cmp("<=", rhs);
+  }
+
+  toString(): string {
+    return `params.${this.name}`;
+  }
+
+  /** @internal */
+  toSpec(): WireParamSpec<T> {
+    const { default: paramDefault, ...otherOptions } = this.options;
+
+    const out: WireParamSpec<T> = {
+      name: this.name,
+      ...otherOptions,
+      type: (this.constructor as typeof Param).type,
+    };
+
+    if (paramDefault instanceof Expression) {
+      out.default = paramDefault.toCEL();
+    } else if (paramDefault !== undefined) {
+      out.default = paramDefault;
+    }
+
+    if (out.input && "text" in out.input && out.input.text.validationRegex instanceof RegExp) {
+      out.input.text.validationRegex = out.input.text.validationRegex.source;
+    }
+
+    return out;
+  }
+}
+
+/**
+ * A parametrized string whose value is stored in Cloud Secret Manager
+ * instead of the local filesystem. Supply instances of SecretParams to
+ * the secrets array while defining a Function to make their values accessible
+ * during execution of that Function.
+ */
+export class SecretParam {
+  static type: ParamValueType = "secret";
+  name: string;
+
+  constructor(name: string) {
+    this.name = name;
+  }
+
+  /** @internal */
+  runtimeValue(): string {
+    return process.env[this.name] || "";
+  }
+
+  /** @internal */
+  toSpec(): ParamSpec<string> {
+    return {
+      type: "secret",
+      name: this.name,
+    };
+  }
+}
+
+/**
+ *  A parametrized value of String type that will be read from .env files
+ *  if present, or prompted for by the CLI if missing.
+ */
+export class StringParam extends Param<string> {
+  /** @internal */
+  runtimeValue(): string {
+    return process.env[this.name] || "";
+  }
+}
+
+/**
+ * A CEL expression which represents an internal Firebase variable. This class
+ * cannot be instantiated by developers, but we provide several canned instances
+ * of it to make available params that will never have to be defined at
+ * deployment time, and can always be read from process.env.
+ * @internal
+ */
+export class InternalExpression extends Param<string> {
+  constructor(name: string, private readonly getter: (env: NodeJS.ProcessEnv) => string) {
+    super(name);
+  }
+
+  /** @internal */
+  runtimeValue(): string {
+    return this.getter(process.env) || "";
+  }
+
+  toSpec(): WireParamSpec<string> {
+    throw new Error("An InternalExpression should never be marshalled for wire transmission.");
+  }
+}
+
+/**
+ *  A parametrized value of Integer type that will be read from .env files
+ *  if present, or prompted for by the CLI if missing.
+ */
+export class IntParam extends Param<number> {
+  static type: ParamValueType = "int";
+
+  /** @internal */
+  runtimeValue(): number {
+    return parseInt(process.env[this.name] || "0", 10) || 0;
+  }
+}
+
+/**
+ *  A parametrized value of Float type that will be read from .env files
+ *  if present, or prompted for by the CLI if missing.
+ */
+export class FloatParam extends Param<number> {
+  static type: ParamValueType = "float";
+
+  /** @internal */
+  runtimeValue(): number {
+    return parseFloat(process.env[this.name] || "0") || 0;
+  }
+}
+
+/**
+ *  A parametrized value of Boolean type that will be read from .env files
+ *  if present, or prompted for by the CLI if missing.
+ */
+export class BooleanParam extends Param<boolean> {
+  static type: ParamValueType = "boolean";
+
+  /** @internal */
+  runtimeValue(): boolean {
+    return !!process.env[this.name] && process.env[this.name] === "true";
+  }
+
+  then<T extends string | number | boolean>(ifTrue: T | Expression<T>, ifFalse: T | Expression<T>) {
+    return new TernaryExpression(this, ifTrue, ifFalse);
+  }
+}
diff --git a/src/runtime/loader.ts b/src/runtime/loader.ts
index 4dd4b41d2..d1f9f2f32 100644
--- a/src/runtime/loader.ts
+++ b/src/runtime/loader.ts
@@ -19,39 +19,34 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
-import * as path from 'path';
-import * as url from 'url';
+import * as path from "path";
+import * as url from "url";
 
-import {
-  ManifestEndpoint,
-  ManifestRequiredAPI,
-  ManifestStack,
-} from './manifest';
+import { ManifestEndpoint, ManifestRequiredAPI, ManifestStack } from "./manifest";
 
-import * as params from '../v2/params';
+import * as params from "../params";
 
 /**
  * Dynamically load import function to prevent TypeScript from
  * transpiling into a require.
  *
  * See https://github.com/microsoft/TypeScript/issues/43329.
+ *
  */
-const dynamicImport = new Function(
-  'modulePath',
-  'return import(modulePath)'
-) as (modulePath: string) => Promise<any>;
+// eslint-disable-next-line @typescript-eslint/no-implied-eval
+const dynamicImport = new Function("modulePath", "return import(modulePath)") as (
+  modulePath: string
+) => Promise<any>;
 
 async function loadModule(functionsDir: string) {
   const absolutePath = path.resolve(functionsDir);
   try {
     return require(path.resolve(absolutePath));
   } catch (e) {
-    if (e.code === 'ERR_REQUIRE_ESM') {
+    if (e.code === "ERR_REQUIRE_ESM") {
       // This is an ESM package!
       const modulePath = require.resolve(absolutePath);
       // Resolve module path to file:// URL. Required for windows support.
-      // @ts-ignore pathToFileURL exists for Node.js v10 and up. Since ESM support exists for Node.js v13 and up, we
-      // can be sure that this function exists here.
       const moduleURL = url.pathToFileURL(modulePath).href;
       return await dynamicImport(moduleURL);
     }
@@ -64,34 +59,28 @@ export function extractStack(
   module,
   endpoints: Record<string, ManifestEndpoint>,
   requiredAPIs: ManifestRequiredAPI[],
-  prefix = ''
+  prefix = ""
 ) {
   for (const [name, valAsUnknown] of Object.entries(module)) {
     // We're introspecting untrusted code here. Any is appropraite
     const val: any = valAsUnknown;
-    if (
-      typeof val === 'function' &&
-      val.__endpoint &&
-      typeof val.__endpoint === 'object'
-    ) {
+    if (typeof val === "function" && val.__endpoint && typeof val.__endpoint === "object") {
       const funcName = prefix + name;
       endpoints[funcName] = {
         ...val.__endpoint,
-        entryPoint: funcName.replace(/-/g, '.'),
+        entryPoint: funcName.replace(/-/g, "."),
       };
       if (val.__requiredAPIs && Array.isArray(val.__requiredAPIs)) {
         requiredAPIs.push(...val.__requiredAPIs);
       }
-    } else if (typeof val === 'object' && val !== null) {
-      extractStack(val, endpoints, requiredAPIs, prefix + name + '-');
+    } else if (typeof val === "object" && val !== null) {
+      extractStack(val, endpoints, requiredAPIs, prefix + name + "-");
     }
   }
 }
 
 /* @internal */
-export function mergeRequiredAPIs(
-  requiredAPIs: ManifestRequiredAPI[]
-): ManifestRequiredAPI[] {
+export function mergeRequiredAPIs(requiredAPIs: ManifestRequiredAPI[]): ManifestRequiredAPI[] {
   const apiToReasons: Record<string, Set<string>> = {};
   for (const { api, reason } of requiredAPIs) {
     const reasons = apiToReasons[api] || new Set();
@@ -101,7 +90,7 @@ export function mergeRequiredAPIs(
 
   const merged: ManifestRequiredAPI[] = [];
   for (const [api, reasons] of Object.entries(apiToReasons)) {
-    merged.push({ api, reason: Array.from(reasons).join(' ') });
+    merged.push({ api, reason: Array.from(reasons).join(" ") });
   }
   return merged;
 }
@@ -116,7 +105,7 @@ export async function loadStack(functionsDir: string): Promise<ManifestStack> {
 
   const stack: ManifestStack = {
     endpoints,
-    specVersion: 'v1alpha1',
+    specVersion: "v1alpha1",
     requiredAPIs: mergeRequiredAPIs(requiredAPIs),
   };
   if (params.declaredParams.length > 0) {
diff --git a/src/runtime/manifest.ts b/src/runtime/manifest.ts
index 553854ae0..9780b1af4 100644
--- a/src/runtime/manifest.ts
+++ b/src/runtime/manifest.ts
@@ -20,29 +20,34 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { Expression } from '../v2/params';
-import { ParamSpec } from '../v2/params/types';
+import { RESET_VALUE, ResettableKeys, ResetValue } from "../common/options";
+import { Expression } from "../params";
+import { WireParamSpec } from "../params/types";
 
 /**
  * An definition of a function as appears in the Manifest.
+ *
+ * @alpha
  */
 export interface ManifestEndpoint {
   entryPoint?: string;
   region?: string[];
   platform?: string;
-  availableMemoryMb?: number | Expression<number>;
-  maxInstances?: number | Expression<number>;
-  minInstances?: number | Expression<number>;
-  concurrency?: number | Expression<number>;
-  serviceAccountEmail?: string;
-  timeoutSeconds?: number | Expression<number>;
-  cpu?: number | 'gcf_gen1';
-  vpc?: {
-    connector: string | Expression<string>;
-    egressSettings?: string;
-  };
+  availableMemoryMb?: number | Expression<number> | ResetValue;
+  maxInstances?: number | Expression<number> | ResetValue;
+  minInstances?: number | Expression<number> | ResetValue;
+  concurrency?: number | Expression<number> | ResetValue;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
+  vpc?:
+    | {
+        connector: string | Expression<string>;
+        egressSettings?: string | Expression<string> | ResetValue;
+      }
+    | ResetValue;
+  serviceAccountEmail?: string | Expression<string> | ResetValue;
+  cpu?: number | "gcf_gen1";
   labels?: Record<string, string>;
-  ingressSettings?: string;
+  ingressSettings?: string | Expression<string> | ResetValue;
   environmentVariables?: Record<string, string>;
   secretEnvironmentVariables?: Array<{ key: string; secret?: string }>;
 
@@ -50,27 +55,44 @@ export interface ManifestEndpoint {
     invoker?: string[];
   };
 
-  callableTrigger?: {};
+  callableTrigger?: Record<string, never>;
 
   eventTrigger?: {
     eventFilters: Record<string, string | Expression<string>>;
     eventFilterPathPatterns?: Record<string, string | Expression<string>>;
     channel?: string;
     eventType: string;
-    retry: boolean | Expression<boolean>;
+    retry: boolean | Expression<boolean> | ResetValue;
     region?: string;
-    serviceAccountEmail?: string;
+    serviceAccountEmail?: string | ResetValue;
   };
 
+  taskQueueTrigger?: {
+    retryConfig?: {
+      maxAttempts?: number | Expression<number> | ResetValue;
+      maxRetrySeconds?: number | Expression<number> | ResetValue;
+      maxBackoffSeconds?: number | Expression<number> | ResetValue;
+      maxDoublings?: number | Expression<number> | ResetValue;
+      minBackoffSeconds?: number | Expression<number> | ResetValue;
+    };
+    rateLimits?: {
+      maxConcurrentDispatches?: number | Expression<number> | ResetValue;
+      maxDispatchesPerSecond?: number | Expression<number> | ResetValue;
+    };
+  };
   scheduleTrigger?: {
-    schedule?: string | Expression<string>;
-    timeZone?: string | Expression<string>;
+    schedule: string | Expression<string>;
+    timeZone?: string | Expression<string> | ResetValue;
     retryConfig?: {
-      retryCount?: number | Expression<number>;
-      maxRetrySeconds?: string | Expression<string>;
-      minBackoffSeconds?: string | Expression<string>;
-      maxBackoffSeconds?: string | Expression<string>;
-      maxDoublings?: number | Expression<number>;
+      retryCount?: number | Expression<number> | ResetValue;
+      maxRetrySeconds?: string | Expression<string> | ResetValue;
+      minBackoffSeconds?: string | Expression<string> | ResetValue;
+      maxBackoffSeconds?: string | Expression<string> | ResetValue;
+      maxDoublings?: number | Expression<number> | ResetValue;
+      // Note: v1 schedule functions use *Duration instead of *Seconds
+      maxRetryDuration?: string | Expression<string> | ResetValue;
+      minBackoffDuration?: string | Expression<string> | ResetValue;
+      maxBackoffDuration?: string | Expression<string> | ResetValue;
     };
   };
 
@@ -80,6 +102,10 @@ export interface ManifestEndpoint {
   };
 }
 
+/**
+ * Description of API required for this stack.
+ * @alpha
+ */
 export interface ManifestRequiredAPI {
   api: string;
   reason: string;
@@ -87,10 +113,11 @@ export interface ManifestRequiredAPI {
 
 /**
  * An definition of a function deployment as appears in the Manifest.
+ * @alpha
  */
 export interface ManifestStack {
-  specVersion: 'v1alpha1';
-  params?: ParamSpec[];
+  specVersion: "v1alpha1";
+  params?: WireParamSpec<any>[];
   requiredAPIs: ManifestRequiredAPI[];
   endpoints: Record<string, ManifestEndpoint>;
 }
@@ -99,19 +126,163 @@ export interface ManifestStack {
  * Returns the JSON representation of a ManifestStack, which has CEL
  * expressions in its options as object types, with its expressions
  * transformed into the actual CEL strings.
- * @internal
+ *
+ * @alpha
  */
-export function stackToWire(stack: ManifestStack): Object {
+export function stackToWire(stack: ManifestStack): Record<string, unknown> {
   const wireStack = stack as any;
-  const traverse = function traverse(obj: Object) {
+  const traverse = function traverse(obj: Record<string, unknown>) {
     for (const [key, val] of Object.entries(obj)) {
       if (val instanceof Expression) {
         obj[key] = val.toCEL();
-      } else if (typeof val === 'object' && val !== null) {
-        traverse(val);
+      } else if (val instanceof ResetValue) {
+        obj[key] = val.toJSON();
+      } else if (typeof val === "object" && val !== null) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        traverse(val as any);
       }
     }
   };
   traverse(wireStack.endpoints);
   return wireStack;
 }
+
+const RESETTABLE_OPTIONS: ResettableKeys<ManifestEndpoint> = {
+  availableMemoryMb: null,
+  timeoutSeconds: null,
+  minInstances: null,
+  maxInstances: null,
+  ingressSettings: null,
+  concurrency: null,
+  serviceAccountEmail: null,
+  vpc: null,
+};
+
+interface ManifestOptions {
+  preserveExternalChanges?: boolean;
+}
+
+function initEndpoint(
+  resetOptions: Record<string, unknown>,
+  ...opts: ManifestOptions[]
+): ManifestEndpoint {
+  const endpoint: ManifestEndpoint = {};
+  if (opts.every((opt) => !opt?.preserveExternalChanges)) {
+    for (const key of Object.keys(resetOptions)) {
+      endpoint[key] = RESET_VALUE;
+    }
+  }
+  return endpoint;
+}
+
+/**
+ * @internal
+ */
+export function initV1Endpoint(...opts: ManifestOptions[]): ManifestEndpoint {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { concurrency, ...resetOpts } = RESETTABLE_OPTIONS;
+  return initEndpoint({ ...resetOpts }, ...opts);
+}
+
+/**
+ * @internal
+ */
+export function initV2Endpoint(...opts: ManifestOptions[]): ManifestEndpoint {
+  return initEndpoint(RESETTABLE_OPTIONS, ...opts);
+}
+
+const RESETTABLE_RETRY_CONFIG_OPTIONS: ResettableKeys<
+  ManifestEndpoint["taskQueueTrigger"]["retryConfig"]
+> = {
+  maxAttempts: null,
+  maxDoublings: null,
+  maxBackoffSeconds: null,
+  maxRetrySeconds: null,
+  minBackoffSeconds: null,
+};
+
+const RESETTABLE_RATE_LIMITS_OPTIONS: ResettableKeys<
+  ManifestEndpoint["taskQueueTrigger"]["rateLimits"]
+> = {
+  maxConcurrentDispatches: null,
+  maxDispatchesPerSecond: null,
+};
+
+/**
+ * @internal
+ */
+export function initTaskQueueTrigger(
+  ...opts: ManifestOptions[]
+): ManifestEndpoint["taskQueueTrigger"] {
+  let taskQueueTrigger = {};
+  if (opts.every((opt) => !opt?.preserveExternalChanges)) {
+    const retryConfig = {};
+    for (const key of Object.keys(RESETTABLE_RETRY_CONFIG_OPTIONS)) {
+      retryConfig[key] = RESET_VALUE;
+    }
+    const rateLimits = {};
+    for (const key of Object.keys(RESETTABLE_RATE_LIMITS_OPTIONS)) {
+      rateLimits[key] = RESET_VALUE;
+    }
+    taskQueueTrigger = { retryConfig, rateLimits };
+  }
+  return taskQueueTrigger;
+}
+
+const RESETTABLE_V1_SCHEDULE_OPTIONS: Omit<
+  ResettableKeys<ManifestEndpoint["scheduleTrigger"]["retryConfig"]>,
+  "maxBackoffSeconds" | "minBackoffSeconds" | "maxRetrySeconds"
+> = {
+  retryCount: null,
+  maxDoublings: null,
+  maxRetryDuration: null,
+  maxBackoffDuration: null,
+  minBackoffDuration: null,
+};
+
+const RESETTABLE_V2_SCHEDULE_OPTIONS: Omit<
+  ResettableKeys<ManifestEndpoint["scheduleTrigger"]["retryConfig"]>,
+  "maxRetryDuration" | "maxBackoffDuration" | "minBackoffDuration"
+> = {
+  retryCount: null,
+  maxDoublings: null,
+  maxRetrySeconds: null,
+  minBackoffSeconds: null,
+  maxBackoffSeconds: null,
+};
+
+function initScheduleTrigger(
+  resetOptions: Record<string, unknown>,
+  schedule: string | Expression<string>,
+  ...opts: ManifestOptions[]
+): ManifestEndpoint["scheduleTrigger"] {
+  let scheduleTrigger: ManifestEndpoint["scheduleTrigger"] = { schedule };
+  if (opts.every((opt) => !opt?.preserveExternalChanges)) {
+    const retryConfig = {};
+    for (const key of Object.keys(resetOptions)) {
+      retryConfig[key] = RESET_VALUE;
+    }
+    scheduleTrigger = { ...scheduleTrigger, timeZone: RESET_VALUE, retryConfig };
+  }
+  return scheduleTrigger;
+}
+
+/**
+ * @internal
+ */
+export function initV1ScheduleTrigger(
+  schedule: string | Expression<string>,
+  ...opts: ManifestOptions[]
+): ManifestEndpoint["scheduleTrigger"] {
+  return initScheduleTrigger(RESETTABLE_V1_SCHEDULE_OPTIONS, schedule, ...opts);
+}
+
+/**
+ * @internal
+ */
+export function initV2ScheduleTrigger(
+  schedule: string | Expression<string>,
+  ...opts: ManifestOptions[]
+): ManifestEndpoint["scheduleTrigger"] {
+  return initScheduleTrigger(RESETTABLE_V2_SCHEDULE_OPTIONS, schedule, ...opts);
+}
diff --git a/src/setup.ts b/src/setup.ts
deleted file mode 100644
index 6a9db702d..000000000
--- a/src/setup.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2017 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-/** @hidden */
-import { firebaseConfig } from './config';
-import { warn } from './logger';
-
-// Set up for config and vars
-export function setup() {
-  // TEMPORARY WORKAROUND (BUG 63586213):
-  // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what
-  // we can deduce.
-  if (!process.env.FIREBASE_CONFIG) {
-    const cfg = firebaseConfig();
-    if (cfg) {
-      process.env.FIREBASE_CONFIG = JSON.stringify(cfg);
-    }
-  }
-
-  // WORKAROUND (BUG 134416569): GCLOUD_PROJECT missing in Node 10
-  if (!process.env.GCLOUD_PROJECT && process.env.FIREBASE_CONFIG) {
-    process.env.GCLOUD_PROJECT = JSON.parse(
-      process.env.FIREBASE_CONFIG
-    ).projectId;
-  }
-
-  // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate
-  if (!process.env.FIREBASE_CONFIG) {
-    if (process.env.GCLOUD_PROJECT) {
-      warn(
-        'Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail'
-      );
-      process.env.FIREBASE_CONFIG = JSON.stringify({
-        databaseURL:
-          process.env.DATABASE_URL ||
-          `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`,
-        storageBucket:
-          process.env.STORAGE_BUCKET_URL ||
-          `${process.env.GCLOUD_PROJECT}.appspot.com`,
-        projectId: process.env.GCLOUD_PROJECT,
-      });
-    } else {
-      warn(
-        'Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail'
-      );
-    }
-  }
-}
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 164cd4d74..55ae292d9 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-empty-interface */
 export {};
 
 declare global {
diff --git a/src/cloud-functions.ts b/src/v1/cloud-functions.ts
similarity index 50%
rename from src/cloud-functions.ts
rename to src/v1/cloud-functions.ts
index c90bdaea4..1b2f397d2 100644
--- a/src/cloud-functions.ts
+++ b/src/v1/cloud-functions.ts
@@ -20,49 +20,56 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { Request, Response } from 'express';
-import * as _ from 'lodash';
-import {
-  DEFAULT_FAILURE_POLICY,
-  DeploymentOptions,
-  FailurePolicy,
-  Schedule,
-} from './function-configuration';
-import { warn } from './logger';
+import { Request, Response } from "express";
+import { warn } from "../logger";
+import { DeploymentOptions, RESET_VALUE } from "./function-configuration";
 export { Request, Response };
+import { convertIfPresent, copyIfPresent } from "../common/encoding";
 import {
-  convertIfPresent,
-  copyIfPresent,
-  Duration,
-  durationFromSeconds,
-  serviceAccountFromShorthand,
-} from './common/encoding';
-import { ManifestEndpoint, ManifestRequiredAPI } from './runtime/manifest';
+  initV1Endpoint,
+  initV1ScheduleTrigger,
+  ManifestEndpoint,
+  ManifestRequiredAPI,
+} from "../runtime/manifest";
+import { ResetValue } from "../common/options";
+import { SecretParam } from "../params/types";
 
-export { Change } from './common/change';
+export { Change } from "../common/change";
 
-/** @hidden */
-const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g');
+/** @internal */
+const WILDCARD_REGEX = new RegExp("{[^/{}]*}", "g");
 
 /**
- * @hidden
- *
  * Wire format for an event.
  */
 export interface Event {
+  /**
+   * Wire format for an event context.
+   */
   context: {
     eventId: string;
     timestamp: string;
     eventType: string;
     resource: Resource;
     domain?: string;
+    auth?: {
+      variable?: {
+        uid?: string;
+        token?: string;
+      };
+      admin: boolean;
+    };
   };
+  /**
+   * Event data over wire.
+   */
   data: any;
 }
 
 /**
  * The context in which an event occurred.
  *
+ * @remarks
  * An EventContext describes:
  * - The time an event occurred.
  * - A unique identifier of the event.
@@ -70,12 +77,14 @@ export interface Event {
  * - Authorization of the request that triggered the event, if applicable and
  *   available.
  */
-export interface EventContext {
+export interface EventContext<Params = Record<string, string>> {
   /**
    * Authentication information for the user that triggered the function.
+   *
+   * @remarks
    * This object contains `uid` and `token` properties for authenticated users.
    * For more detail including token keys, see the
-   * [security rules reference](/docs/firestore/reference/security/#properties).
+   * {@link https://firebase.google.com/docs/reference/rules/rules#properties | security rules reference}.
    *
    * This field is only populated for Realtime Database triggers and Callable
    * functions. For an unauthenticated user, this field is null. For Firebase
@@ -88,15 +97,21 @@ export interface EventContext {
   };
 
   /**
-   * The level of permissions for a user. Valid values are:
+   * The level of permissions for a user.
+   *
+   * @remarks
+   * Valid values are:
+   *
+   * - `ADMIN`: Developer user or user authenticated via a service account.
+   *
+   * - `USER`: Known user.
+   *
+   * - `UNAUTHENTICATED`: Unauthenticated action
    *
-   * * `ADMIN` Developer user or user authenticated via a service account.
-   * * `USER` Known user.
-   * * `UNAUTHENTICATED` Unauthenticated action
-   * * `null` For event types that do not provide user information (all except
+   * - `null`: For event types that do not provide user information (all except
    *   Realtime Database).
    */
-  authType?: 'ADMIN' | 'USER' | 'UNAUTHENTICATED';
+  authType?: "ADMIN" | "USER" | "UNAUTHENTICATED";
 
   /**
    * The event’s unique identifier.
@@ -104,46 +119,70 @@ export interface EventContext {
   eventId: string;
 
   /**
-   * Type of event. Possible values are:
-   *
-   * * `google.analytics.event.log`
-   * * `google.firebase.auth.user.create`
-   * * `google.firebase.auth.user.delete`
-   * * `google.firebase.database.ref.write`
-   * * `google.firebase.database.ref.create`
-   * * `google.firebase.database.ref.update`
-   * * `google.firebase.database.ref.delete`
-   * * `google.firestore.document.write`
-   * * `google.firestore.document.create`
-   * * `google.firestore.document.update`
-   * * `google.firestore.document.delete`
-   * * `google.pubsub.topic.publish`
-   * * `google.firebase.remoteconfig.update`
-   * * `google.storage.object.finalize`
-   * * `google.storage.object.archive`
-   * * `google.storage.object.delete`
-   * * `google.storage.object.metadataUpdate`
-   * * `google.testing.testMatrix.complete`
+   * Type of event.
+   *
+   * @remarks
+   * Possible values are:
+   *
+   * - `google.analytics.event.log`
+   *
+   * - `google.firebase.auth.user.create`
+   *
+   * - `google.firebase.auth.user.delete`
+   *
+   * - `google.firebase.database.ref.write`
+   *
+   * - `google.firebase.database.ref.create`
+   *
+   * - `google.firebase.database.ref.update`
+   *
+   * - `google.firebase.database.ref.delete`
+   *
+   * - `google.firestore.document.write`
+   *
+   * - `google.firestore.document.create`
+   *
+   * - `google.firestore.document.update`
+   *
+   * - `google.firestore.document.delete`
+   *
+   * - `google.pubsub.topic.publish`
+   *
+   * - `google.firebase.remoteconfig.update`
+   *
+   * - `google.storage.object.finalize`
+   *
+   * - `google.storage.object.archive`
+   *
+   * - `google.storage.object.delete`
+   *
+   * - `google.storage.object.metadataUpdate`
+   *
+   * - `google.testing.testMatrix.complete`
    */
   eventType: string;
 
   /**
    * An object containing the values of the wildcards in the `path` parameter
-   * provided to the [`ref()`](providers_database_.html#ref) method for a Realtime
-   * Database trigger. Cannot be accessed while inside the handler namespace.
+   * provided to the {@link fireabase-functions.v1.database#ref | `ref()`} method for a Realtime Database trigger.
    */
-  params: { [option: string]: any };
+  params: Params;
 
   /**
-   * The resource that emitted the event. Valid values are:
+   * The resource that emitted the event.
    *
-   * * Analytics &mdash; `projects/<projectId>/events/<analyticsEventType>`
-   * * Realtime Database &mdash;
-       `projects/_/instances/<databaseInstance>/refs/<databasePath>`
-   * * Storage &mdash;
-      `projects/_/buckets/<bucketName>/objects/<fileName>#<generation>`
-   * * Authentication &mdash; `projects/<projectId>`
-   * * Pub/Sub &mdash; `projects/<projectId>/topics/<topicName>`
+   * @remarks
+   * Valid values are:
+   *
+   * Analytics: `projects/<projectId>/events/<analyticsEventType>`
+   *
+   * Realtime Database: `projects/_/instances/<databaseInstance>/refs/<databasePath>`
+   *
+   * Storage: `projects/_/buckets/<bucketName>/objects/<fileName>#<generation>`
+   *
+   * Authentication: `projects/<projectId>`
+   *
+   * Pub/Sub: `projects/<projectId>/topics/<topicName>`
    *
    * Because Realtime Database instances and Cloud Storage buckets are globally
    * unique and not tied to the project, their resources start with `projects/_`.
@@ -151,8 +190,7 @@ export interface EventContext {
    */
   resource: Resource;
   /**
-   * Timestamp for the event as an
-   * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) string.
+   * Timestamp for the event as an {@link https://www.ietf.org/rfc/rfc3339.txt | RFC 3339} string.
    */
   timestamp: string;
 }
@@ -163,65 +201,44 @@ export interface EventContext {
  * resource that triggered the function - such as a storage bucket.
  */
 export interface Resource {
+  /** The name of the service that this resource belongs to. */
   service: string;
+  /**
+   * The stable identifier (name) of a resource on the service.
+   * A resource can be logically identified as "//{resource.service}/{resource.name}"
+   */
   name: string;
+  /**
+   * The type of the resource. The syntax is platform-specific because different platforms define their resources differently.
+   * For Google APIs, the type format must be "{service}/{kind}"
+   */
   type?: string;
+  /** Map of Resource's labels. */
   labels?: { [tag: string]: string };
 }
 
-/**
- * TriggerAnnotion is used internally by the firebase CLI to understand what
- * type of Cloud Function to deploy.
- */
-interface TriggerAnnotation {
-  availableMemoryMb?: number;
-  blockingTrigger?: {
-    eventType: string;
-    options?: Record<string, unknown>;
-  };
-  eventTrigger?: {
-    eventType: string;
-    resource: string;
-    service: string;
-  };
-  failurePolicy?: FailurePolicy;
-  httpsTrigger?: {
-    invoker?: string[];
-  };
-  labels?: { [key: string]: string };
-  regions?: string[];
-  schedule?: Schedule;
-  timeout?: Duration;
-  vpcConnector?: string;
-  vpcConnectorEgressSettings?: string;
-  serviceAccountEmail?: string;
-  ingressSettings?: string;
-  secrets?: string[];
-}
-
 /**
  * A Runnable has a `run` method which directly invokes the user-defined
  * function - useful for unit testing.
  */
 export interface Runnable<T> {
+  /** Directly invoke the user defined function. */
   run: (data: T, context: any) => PromiseLike<any> | any;
 }
 
 /**
- * The Cloud Function type for HTTPS triggers. This should be exported from your
+ * The function type for HTTPS triggers. This should be exported from your
  * JavaScript file to define a Cloud Function.
  *
+ * @remarks
  * This type is a special JavaScript function which takes Express
- * [`Request`](https://expressjs.com/en/api.html#req) and
- * [`Response`](https://expressjs.com/en/api.html#res) objects as its only
+ * {@link https://expressjs.com/en/api.html#req | `Request` } and
+ * {@link https://expressjs.com/en/api.html#res | `Response` } objects as its only
  * arguments.
  */
 export interface HttpsFunction {
   (req: Request, resp: Response): void | Promise<void>;
 
-  /** @alpha */
-  __trigger: TriggerAnnotation;
-
   /** @alpha */
   __endpoint: ManifestEndpoint;
 
@@ -230,14 +247,18 @@ export interface HttpsFunction {
 }
 
 /**
- * The Cloud Function type for Blocking triggers.
+ * The function type for Auth Blocking triggers.
+ *
+ * @remarks
+ * This type is a special JavaScript function for Auth Blocking triggers which takes Express
+ * {@link https://expressjs.com/en/api.html#req | `Request` } and
+ * {@link https://expressjs.com/en/api.html#res | `Response` } objects as its only
+ * arguments.
  */
 export interface BlockingFunction {
+  /** @public */
   (req: Request, resp: Response): void | Promise<void>;
 
-  /** @alpha */
-  __trigger: TriggerAnnotation;
-
   /** @alpha */
   __endpoint: ManifestEndpoint;
 
@@ -246,7 +267,7 @@ export interface BlockingFunction {
 }
 
 /**
- * The Cloud Function type for all non-HTTPS triggers. This should be exported
+ * The function type for all non-HTTPS triggers. This should be exported
  * from your JavaScript file to define a Cloud Function.
  *
  * This type is a special JavaScript function which takes a templated
@@ -255,9 +276,6 @@ export interface BlockingFunction {
 export interface CloudFunction<T> extends Runnable<T> {
   (input: any, context?: any): PromiseLike<any> | any;
 
-  /** @alpha */
-  __trigger: TriggerAnnotation;
-
   /** @alpha */
   __endpoint: ManifestEndpoint;
 
@@ -265,7 +283,7 @@ export interface CloudFunction<T> extends Runnable<T> {
   __requiredAPIs?: ManifestRequiredAPI[];
 }
 
-/** @hidden */
+/** @internal */
 export interface MakeCloudFunctionArgs<EventData> {
   after?: (raw: Event) => void;
   before?: (raw: Event) => void;
@@ -285,10 +303,8 @@ export interface MakeCloudFunctionArgs<EventData> {
   triggerResource: () => string;
 }
 
-/** @hidden */
+/** @internal */
 export function makeCloudFunction<EventData>({
-  after = () => {},
-  before = () => {},
   contextOnlyHandler,
   dataConstructor = (raw: Event) => raw.data,
   eventType,
@@ -306,7 +322,7 @@ export function makeCloudFunction<EventData>({
        * v1beta1 event flow has different format for context, transform them to
        * new format.
        */
-      context.eventType = provider + '.' + eventType;
+      context.eventType = provider + "." + eventType;
       context.resource = {
         service,
         name: context.resource,
@@ -318,9 +334,9 @@ export function makeCloudFunction<EventData>({
       context,
     };
 
-    if (provider === 'google.firebase.database') {
+    if (provider === "google.firebase.database") {
       context.authType = _detectAuthType(event);
-      if (context.authType !== 'ADMIN') {
+      if (context.authType !== "ADMIN") {
         context.auth = _makeAuth(event, context.authType);
       } else {
         delete context.auth;
@@ -328,77 +344,56 @@ export function makeCloudFunction<EventData>({
     }
 
     if (triggerResource() == null) {
-      Object.defineProperty(context, 'params', {
+      Object.defineProperty(context, "params", {
         get: () => {
-          throw new Error(
-            'context.params is not available when using the handler namespace.'
-          );
+          throw new Error("context.params is not available when using the handler namespace.");
         },
       });
     } else {
       context.params = context.params || _makeParams(context, triggerResource);
     }
 
-    before(event);
-
     let promise;
-    if (labels && labels['deployment-scheduled']) {
+    if (labels && labels["deployment-scheduled"]) {
       // Scheduled function do not have meaningful data, so exclude it
       promise = contextOnlyHandler(context);
     } else {
       const dataOrChange = dataConstructor(event);
       promise = handler(dataOrChange, context);
     }
-    if (typeof promise === 'undefined') {
-      warn('Function returned undefined, expected Promise or value');
+    if (typeof promise === "undefined") {
+      warn("Function returned undefined, expected Promise or value");
     }
-    return Promise.resolve(promise)
-      .then((result) => {
-        after(event);
-        return result;
-      })
-      .catch((err) => {
-        after(event);
-        return Promise.reject(err);
-      });
+    return Promise.resolve(promise);
   };
 
-  Object.defineProperty(cloudFunction, '__trigger', {
-    get: () => {
-      if (triggerResource() == null) {
-        return {};
-      }
-
-      const trigger: any = _.assign(optionsToTrigger(options), {
-        eventTrigger: {
-          resource: triggerResource(),
-          eventType: legacyEventType || provider + '.' + eventType,
-          service,
-        },
-      });
-      if (!_.isEmpty(labels)) {
-        trigger.labels = { ...trigger.labels, ...labels };
-      }
-      return trigger;
-    },
-  });
-
-  Object.defineProperty(cloudFunction, '__endpoint', {
+  Object.defineProperty(cloudFunction, "__endpoint", {
     get: () => {
       if (triggerResource() == null) {
         return undefined;
       }
 
       const endpoint: ManifestEndpoint = {
-        platform: 'gcfv1',
+        platform: "gcfv1",
+        ...initV1Endpoint(options),
         ...optionsToEndpoint(options),
       };
 
       if (options.schedule) {
-        endpoint.scheduleTrigger = options.schedule;
+        endpoint.scheduleTrigger = initV1ScheduleTrigger(options.schedule.schedule, options);
+        copyIfPresent(endpoint.scheduleTrigger, options.schedule, "timeZone");
+        copyIfPresent(
+          endpoint.scheduleTrigger.retryConfig,
+          options.schedule.retryConfig,
+          "retryCount",
+          "maxDoublings",
+          "maxBackoffDuration",
+          "maxRetryDuration",
+          "minBackoffDuration"
+        );
       } else {
         endpoint.eventTrigger = {
-          eventType: legacyEventType || provider + '.' + eventType,
+          eventType: legacyEventType || provider + "." + eventType,
           eventFilters: {
             resource: triggerResource(),
           },
@@ -418,8 +413,8 @@ export function makeCloudFunction<EventData>({
   if (options.schedule) {
     cloudFunction.__requiredAPIs = [
       {
-        api: 'cloudscheduler.googleapis.com',
-        reason: 'Needed for scheduled functions.',
+        api: "cloudscheduler.googleapis.com",
+        reason: "Needed for scheduled functions.",
       },
     ];
   }
@@ -428,11 +423,10 @@ export function makeCloudFunction<EventData>({
   return cloudFunction;
 }
 
-/** @hidden */
 function _makeParams(
   context: EventContext,
   triggerResourceGetter: () => string
-): { [option: string]: any } {
+): Record<string, string> {
   if (context.params) {
     // In unit testing, user may directly provide `context.params`.
     return context.params;
@@ -444,149 +438,82 @@ function _makeParams(
   const triggerResource = triggerResourceGetter();
   const wildcards = triggerResource.match(WILDCARD_REGEX);
   const params: { [option: string]: any } = {};
-  if (wildcards) {
-    const triggerResourceParts = _.split(triggerResource, '/');
-    const eventResourceParts = _.split(context.resource.name, '/');
-    _.forEach(wildcards, (wildcard) => {
+
+  // Note: some tests don't set context.resource.name
+  const eventResourceParts = context?.resource?.name?.split?.("/");
+  if (wildcards && eventResourceParts) {
+    const triggerResourceParts = triggerResource.split("/");
+    for (const wildcard of wildcards) {
       const wildcardNoBraces = wildcard.slice(1, -1);
-      const position = _.indexOf(triggerResourceParts, wildcard);
+      const position = triggerResourceParts.indexOf(wildcard);
       params[wildcardNoBraces] = eventResourceParts[position];
-    });
+    }
   }
   return params;
 }
 
-/** @hidden */
 function _makeAuth(event: Event, authType: string) {
-  if (authType === 'UNAUTHENTICATED') {
+  if (authType === "UNAUTHENTICATED") {
     return null;
   }
   return {
-    uid: _.get(event, 'context.auth.variable.uid'),
-    token: _.get(event, 'context.auth.variable.token'),
+    uid: event.context?.auth?.variable?.uid,
+    token: event.context?.auth?.variable?.token,
   };
 }
 
-/** @hidden */
 function _detectAuthType(event: Event) {
-  if (_.get(event, 'context.auth.admin')) {
-    return 'ADMIN';
+  if (event.context?.auth?.admin) {
+    return "ADMIN";
   }
-  if (_.has(event, 'context.auth.variable')) {
-    return 'USER';
+  if (event.context?.auth?.variable) {
+    return "USER";
   }
-  return 'UNAUTHENTICATED';
-}
-
-/** @hidden */
-export function optionsToTrigger(options: DeploymentOptions) {
-  const trigger: any = {};
-  copyIfPresent(
-    trigger,
-    options,
-    'regions',
-    'schedule',
-    'minInstances',
-    'maxInstances',
-    'ingressSettings',
-    'vpcConnectorEgressSettings',
-    'vpcConnector',
-    'labels',
-    'secrets'
-  );
-  convertIfPresent(
-    trigger,
-    options,
-    'failurePolicy',
-    'failurePolicy',
-    (policy) => {
-      if (policy === false) {
-        return undefined;
-      } else if (policy === true) {
-        return DEFAULT_FAILURE_POLICY;
-      } else {
-        return policy;
-      }
-    }
-  );
-  convertIfPresent(
-    trigger,
-    options,
-    'timeout',
-    'timeoutSeconds',
-    durationFromSeconds
-  );
-  convertIfPresent(trigger, options, 'availableMemoryMb', 'memory', (mem) => {
-    const memoryLookup = {
-      '128MB': 128,
-      '256MB': 256,
-      '512MB': 512,
-      '1GB': 1024,
-      '2GB': 2048,
-      '4GB': 4096,
-      '8GB': 8192,
-    };
-    return memoryLookup[mem];
-  });
-  convertIfPresent(
-    trigger,
-    options,
-    'serviceAccountEmail',
-    'serviceAccount',
-    serviceAccountFromShorthand
-  );
-
-  return trigger;
+  return "UNAUTHENTICATED";
 }
 
-export function optionsToEndpoint(
-  options: DeploymentOptions
-): ManifestEndpoint {
+/** @internal */
+export function optionsToEndpoint(options: DeploymentOptions): ManifestEndpoint {
   const endpoint: ManifestEndpoint = {};
   copyIfPresent(
     endpoint,
     options,
-    'minInstances',
-    'maxInstances',
-    'ingressSettings',
-    'labels',
-    'timeoutSeconds'
+    "minInstances",
+    "maxInstances",
+    "ingressSettings",
+    "labels",
+    "timeoutSeconds"
   );
-  convertIfPresent(endpoint, options, 'region', 'regions');
+  convertIfPresent(endpoint, options, "region", "regions");
+  convertIfPresent(endpoint, options, "serviceAccountEmail", "serviceAccount", (sa) => sa);
   convertIfPresent(
     endpoint,
     options,
-    'serviceAccountEmail',
-    'serviceAccount',
-    (sa) => sa
+    "secretEnvironmentVariables",
+    "secrets",
+    (secrets: (string | SecretParam)[]) =>
+      secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret }))
   );
-  convertIfPresent(
-    endpoint,
-    options,
-    'secretEnvironmentVariables',
-    'secrets',
-    (secrets) => secrets.map((secret) => ({ key: secret }))
-  );
-  if (options?.vpcConnector) {
-    endpoint.vpc = { connector: options.vpcConnector };
-    convertIfPresent(
-      endpoint.vpc,
-      options,
-      'egressSettings',
-      'vpcConnectorEgressSettings'
-    );
+  if (options?.vpcConnector !== undefined) {
+    if (options.vpcConnector === null || options.vpcConnector instanceof ResetValue) {
+      endpoint.vpc = RESET_VALUE;
+    } else {
+      const vpc: ManifestEndpoint["vpc"] = { connector: options.vpcConnector };
+      convertIfPresent(vpc, options, "egressSettings", "vpcConnectorEgressSettings");
+      endpoint.vpc = vpc;
+    }
   }
-  convertIfPresent(endpoint, options, 'availableMemoryMb', 'memory', (mem) => {
+  convertIfPresent(endpoint, options, "availableMemoryMb", "memory", (mem) => {
     const memoryLookup = {
-      '128MB': 128,
-      '256MB': 256,
-      '512MB': 512,
-      '1GB': 1024,
-      '2GB': 2048,
-      '4GB': 4096,
-      '8GB': 8192,
+      "128MB": 128,
+      "256MB": 256,
+      "512MB": 512,
+      "1GB": 1024,
+      "2GB": 2048,
+      "4GB": 4096,
+      "8GB": 8192,
     };
-    return memoryLookup[mem];
+    return typeof mem === "object" ? mem : memoryLookup[mem];
   });
   return endpoint;
 }
diff --git a/src/v1/config.ts b/src/v1/config.ts
new file mode 100644
index 000000000..7821b59d7
--- /dev/null
+++ b/src/v1/config.ts
@@ -0,0 +1,80 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import * as fs from "fs";
+import * as path from "path";
+
+export { firebaseConfig } from "../common/config";
+
+/** @internal */
+export let singleton: Record<string, any>;
+
+/** @internal */
+export function resetCache(): void {
+  singleton = undefined;
+}
+
+/**
+ * Store and retrieve project configuration data such as third-party API
+ * keys or other settings. You can set configuration values using the
+ * Firebase CLI as described in
+ * [Environment Configuration](/docs/functions/config-env).
+ */
+export function config(): Record<string, any> {
+  // K_CONFIGURATION is only set in GCFv2
+  if (process.env.K_CONFIGURATION) {
+    throw new Error(
+      "functions.config() is no longer available in Cloud Functions for " +
+        "Firebase v2. Please see the latest documentation for information " +
+        "on how to transition to using environment variables"
+    );
+  }
+  if (typeof singleton === "undefined") {
+    init();
+  }
+  return singleton;
+}
+
+function init() {
+  try {
+    const parsed = JSON.parse(process.env.CLOUD_RUNTIME_CONFIG);
+    delete parsed.firebase;
+    singleton = parsed;
+    return;
+  } catch (e) {
+    // Do nothing
+  }
+
+  try {
+    const configPath =
+      process.env.CLOUD_RUNTIME_CONFIG || path.join(process.cwd(), ".runtimeconfig.json");
+    const contents = fs.readFileSync(configPath);
+    const parsed = JSON.parse(contents.toString("utf8"));
+    delete parsed.firebase;
+    singleton = parsed;
+    return;
+  } catch (e) {
+    // Do nothing
+  }
+
+  singleton = {};
+}
diff --git a/src/function-builder.ts b/src/v1/function-builder.ts
similarity index 74%
rename from src/function-builder.ts
rename to src/v1/function-builder.ts
index 1fd4efb05..c7e5daa3e 100644
--- a/src/function-builder.ts
+++ b/src/v1/function-builder.ts
@@ -20,10 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
-import * as _ from 'lodash';
+import * as express from "express";
 
-import { CloudFunction, EventContext } from './cloud-functions';
+import { ResetValue } from "../common/options";
+import { SecretParam } from "../params/types";
+import { EventContext } from "./cloud-functions";
 import {
   DeploymentOptions,
   INGRESS_SETTINGS_OPTIONS,
@@ -33,17 +34,17 @@ import {
   SUPPORTED_REGIONS,
   VALID_MEMORY_OPTIONS,
   VPC_EGRESS_SETTINGS_OPTIONS,
-} from './function-configuration';
-import * as analytics from './providers/analytics';
-import * as auth from './providers/auth';
-import * as database from './providers/database';
-import * as firestore from './providers/firestore';
-import * as https from './providers/https';
-import * as pubsub from './providers/pubsub';
-import * as remoteConfig from './providers/remoteConfig';
-import * as storage from './providers/storage';
-import * as tasks from './providers/tasks';
-import * as testLab from './providers/testLab';
+} from "./function-configuration";
+import * as analytics from "./providers/analytics";
+import * as auth from "./providers/auth";
+import * as database from "./providers/database";
+import * as firestore from "./providers/firestore";
+import * as https from "./providers/https";
+import * as pubsub from "./providers/pubsub";
+import * as remoteConfig from "./providers/remoteConfig";
+import * as storage from "./providers/storage";
+import * as tasks from "./providers/tasks";
+import * as testLab from "./providers/testLab";
 
 /**
  * Assert that the runtime options passed in are valid.
@@ -51,72 +52,45 @@ import * as testLab from './providers/testLab';
  * @throws { Error } Memory and TimeoutSeconds values must be valid.
  */
 function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
-  if (
-    runtimeOptions.memory &&
-    !_.includes(VALID_MEMORY_OPTIONS, runtimeOptions.memory)
-  ) {
+  const mem = runtimeOptions.memory;
+  if (mem && typeof mem !== "object" && !VALID_MEMORY_OPTIONS.includes(mem)) {
     throw new Error(
-      `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join(
-        ', '
-      )}`
+      `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join(", ")}`
     );
   }
-  if (
-    runtimeOptions.timeoutSeconds > MAX_TIMEOUT_SECONDS ||
-    runtimeOptions.timeoutSeconds < 0
-  ) {
-    throw new Error(
-      `TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}`
-    );
+  if (runtimeOptions.timeoutSeconds > MAX_TIMEOUT_SECONDS || runtimeOptions.timeoutSeconds < 0) {
+    throw new Error(`TimeoutSeconds must be between 0 and ${MAX_TIMEOUT_SECONDS}`);
   }
 
   if (
     runtimeOptions.ingressSettings &&
-    !_.includes(INGRESS_SETTINGS_OPTIONS, runtimeOptions.ingressSettings)
+    !(runtimeOptions.ingressSettings instanceof ResetValue) &&
+    !INGRESS_SETTINGS_OPTIONS.includes(runtimeOptions.ingressSettings)
   ) {
     throw new Error(
-      `The only valid ingressSettings values are: ${INGRESS_SETTINGS_OPTIONS.join(
-        ','
-      )}`
+      `The only valid ingressSettings values are: ${INGRESS_SETTINGS_OPTIONS.join(",")}`
     );
   }
 
   if (
     runtimeOptions.vpcConnectorEgressSettings &&
-    !_.includes(
-      VPC_EGRESS_SETTINGS_OPTIONS,
-      runtimeOptions.vpcConnectorEgressSettings
-    )
+    !(runtimeOptions.vpcConnectorEgressSettings instanceof ResetValue) &&
+    !VPC_EGRESS_SETTINGS_OPTIONS.includes(runtimeOptions.vpcConnectorEgressSettings)
   ) {
     throw new Error(
       `The only valid vpcConnectorEgressSettings values are: ${VPC_EGRESS_SETTINGS_OPTIONS.join(
-        ','
+        ","
       )}`
     );
   }
 
-  if (runtimeOptions.failurePolicy !== undefined) {
-    if (
-      _.isBoolean(runtimeOptions.failurePolicy) === false &&
-      _.isObjectLike(runtimeOptions.failurePolicy) === false
-    ) {
-      throw new Error(`failurePolicy must be a boolean or an object.`);
-    }
-
-    if (typeof runtimeOptions.failurePolicy === 'object') {
-      if (
-        _.isObjectLike(runtimeOptions.failurePolicy.retry) === false ||
-        _.isEmpty(runtimeOptions.failurePolicy.retry) === false
-      ) {
-        throw new Error('failurePolicy.retry must be an empty object.');
-      }
-    }
-  }
-
+  validateFailurePolicy(runtimeOptions.failurePolicy);
+  const serviceAccount = runtimeOptions.serviceAccount;
   if (
-    runtimeOptions.serviceAccount &&
-    runtimeOptions.serviceAccount !== 'default' &&
-    !_.includes(runtimeOptions.serviceAccount, '@')
+    serviceAccount &&
+    serviceAccount !== "default" &&
+    !(serviceAccount instanceof ResetValue) &&
+    !serviceAccount.includes("@")
   ) {
     throw new Error(
       `serviceAccount must be set to 'default', a service account email, or '{serviceAccountName}@'`
@@ -135,12 +109,12 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
 
     // We reserve the 'deployment' and 'firebase' namespaces for future feature development.
     const reservedKeys = Object.keys(runtimeOptions.labels).filter(
-      (key) => key.startsWith('deployment') || key.startsWith('firebase')
+      (key) => key.startsWith("deployment") || key.startsWith("firebase")
     );
     if (reservedKeys.length) {
       throw new Error(
         `Invalid labels: ${reservedKeys.join(
-          ', '
+          ", "
         )}. Labels may not start with reserved names 'deployment' or 'firebase'`
       );
     }
@@ -151,7 +125,7 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
     if (invalidLengthKeys.length > 0) {
       throw new Error(
         `Invalid labels: ${invalidLengthKeys.join(
-          ', '
+          ", "
         )}. Label keys must be between 1 and 63 characters in length.`
       );
     }
@@ -162,7 +136,7 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
     if (invalidLengthValues.length > 0) {
       throw new Error(
         `Invalid labels: ${invalidLengthValues.join(
-          ', '
+          ", "
         )}. Label values must be less than 64 charcters.`
       );
     }
@@ -175,7 +149,7 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
     if (invalidKeys.length > 0) {
       throw new Error(
         `Invalid labels: ${invalidKeys.join(
-          ', '
+          ", "
         )}. Label keys can only contain lowercase letters, international characters, numbers, _ or -, and must start with a letter.`
       );
     }
@@ -188,41 +162,29 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
     if (invalidValues.length > 0) {
       throw new Error(
         `Invalid labels: ${invalidValues.join(
-          ', '
+          ", "
         )}. Label values can only contain lowercase letters, international characters, numbers, _ or -.`
       );
     }
   }
 
-  if (
-    typeof runtimeOptions.invoker === 'string' &&
-    runtimeOptions.invoker.length === 0
-  ) {
-    throw new Error(
-      'Invalid service account for function invoker, must be a non-empty string'
-    );
+  if (typeof runtimeOptions.invoker === "string" && runtimeOptions.invoker.length === 0) {
+    throw new Error("Invalid service account for function invoker, must be a non-empty string");
   }
-  if (
-    runtimeOptions.invoker !== undefined &&
-    Array.isArray(runtimeOptions.invoker)
-  ) {
+  if (runtimeOptions.invoker !== undefined && Array.isArray(runtimeOptions.invoker)) {
     if (runtimeOptions.invoker.length === 0) {
-      throw new Error(
-        'Invalid invoker array, must contain at least 1 service account entry'
-      );
+      throw new Error("Invalid invoker array, must contain at least 1 service account entry");
     }
     for (const serviceAccount of runtimeOptions.invoker) {
       if (serviceAccount.length === 0) {
-        throw new Error(
-          'Invalid invoker array, a service account must be a non-empty string'
-        );
+        throw new Error("Invalid invoker array, a service account must be a non-empty string");
       }
-      if (serviceAccount === 'public') {
+      if (serviceAccount === "public") {
         throw new Error(
           "Invalid invoker array, a service account cannot be set to the 'public' identifier"
         );
       }
-      if (serviceAccount === 'private') {
+      if (serviceAccount === "private") {
         throw new Error(
           "Invalid invoker array, a service account cannot be set to the 'private' identifier"
         );
@@ -232,19 +194,40 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
 
   if (runtimeOptions.secrets !== undefined) {
     const invalidSecrets = runtimeOptions.secrets.filter(
-      (s) => !/^[A-Za-z\d\-_]+$/.test(s)
+      (s) => !/^[A-Za-z\d\-_]+$/.test(s instanceof SecretParam ? s.name : s)
     );
     if (invalidSecrets.length > 0) {
       throw new Error(
-        `Invalid secrets: ${invalidSecrets.join(',')}. ` +
-          'Secret must be configured using the resource id (e.g. API_KEY)'
+        `Invalid secrets: ${invalidSecrets.join(",")}. ` +
+          "Secret must be configured using the resource id (e.g. API_KEY)"
       );
     }
   }
 
+  if ("allowInvalidAppCheckToken" in runtimeOptions) {
+    throw new Error(
+      'runWith option "allowInvalidAppCheckToken" has been inverted and ' +
+        'renamed "enforceAppCheck"'
+    );
+  }
+
   return true;
 }
 
+function validateFailurePolicy(policy: any) {
+  if (typeof policy === "boolean" || typeof policy === "undefined") {
+    return;
+  }
+  if (typeof policy !== "object") {
+    throw new Error(`failurePolicy must be a boolean or an object.`);
+  }
+
+  const retry = policy.retry;
+  if (typeof retry !== "object" || Object.keys(retry).length) {
+    throw new Error("failurePolicy.retry must be an empty object.");
+  }
+}
+
 /**
  * Assert regions specified are valid.
  * @param regions list of regions.
@@ -252,7 +235,7 @@ function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
  */
 function assertRegionsAreValid(regions: string[]): boolean {
   if (!regions.length) {
-    throw new Error('You must specify at least one region');
+    throw new Error("You must specify at least one region");
   }
   return true;
 }
@@ -308,9 +291,7 @@ export class FunctionBuilder {
    * @example
    * functions.region('us-east1', 'us-central1')
    */
-  region(
-    ...regions: Array<typeof SUPPORTED_REGIONS[number] | string>
-  ): FunctionBuilder {
+  region(...regions: Array<typeof SUPPORTED_REGIONS[number] | string>): FunctionBuilder {
     if (assertRegionsAreValid(regions)) {
       this.options.regions = regions;
       return this;
@@ -334,16 +315,17 @@ export class FunctionBuilder {
    */
   runWith(runtimeOptions: RuntimeOptions): FunctionBuilder {
     if (assertRuntimeOptionsValid(runtimeOptions)) {
-      this.options = _.assign(this.options, runtimeOptions);
+      this.options = {
+        ...this.options,
+        ...runtimeOptions,
+      };
       return this;
     }
   }
 
   get https() {
     if (this.options.failurePolicy !== undefined) {
-      console.warn(
-        'RuntimeOptions.failurePolicy is not supported in https functions.'
-      );
+      console.warn("RuntimeOptions.failurePolicy is not supported in https functions.");
     }
 
     return {
@@ -352,22 +334,14 @@ export class FunctionBuilder {
        * @param handler A function that takes a request and response object,
        * same signature as an Express app.
        */
-      onRequest: (
-        handler: (
-          req: https.Request,
-          resp: express.Response
-        ) => void | Promise<void>
-      ) => https._onRequestWithOptions(handler, this.options),
+      onRequest: (handler: (req: https.Request, resp: express.Response) => void | Promise<void>) =>
+        https._onRequestWithOptions(handler, this.options),
       /**
        * Declares a callable method for clients to call using a Firebase SDK.
        * @param handler A method that takes a data and context and returns a value.
        */
-      onCall: (
-        handler: (
-          data: any,
-          context: https.CallableContext
-        ) => any | Promise<any>
-      ) => https._onCallWithOptions(handler, this.options),
+      onCall: (handler: (data: any, context: https.CallableContext) => any | Promise<any>) =>
+        https._onCallWithOptions(handler, this.options),
     };
   }
 
@@ -391,8 +365,7 @@ export class FunctionBuilder {
        * will pick the default database for your project.
        * @param instance The Realtime Database instance to use.
        */
-      instance: (instance: string) =>
-        database._instanceWithOptions(instance, this.options),
+      instance: (instance: string) => database._instanceWithOptions(instance, this.options),
 
       /**
        * Select Firebase Realtime Database Reference to listen to.
@@ -419,7 +392,7 @@ export class FunctionBuilder {
        *    information about the user who triggered the Cloud Function.
        * @param ref Path of the database to listen to.
        */
-      ref: (path: string) => database._refWithOptions(path, this.options),
+      ref: <Ref extends string>(path: Ref) => database._refWithOptions(path, this.options),
     };
   }
 
@@ -432,16 +405,14 @@ export class FunctionBuilder {
        * collection is named "users" and the document is named "Ada", then the
        * path is "/users/Ada".
        */
-      document: (path: string) =>
+      document: <Path extends string>(path: Path) =>
         firestore._documentWithOptions(path, this.options),
 
       /** @hidden */
-      namespace: (namespace: string) =>
-        firestore._namespaceWithOptions(namespace, this.options),
+      namespace: (namespace: string) => firestore._namespaceWithOptions(namespace, this.options),
 
       /** @hidden */
-      database: (database: string) =>
-        firestore._databaseWithOptions(database, this.options),
+      database: (database: string) => firestore._databaseWithOptions(database, this.options),
     };
   }
 
@@ -469,11 +440,7 @@ export class FunctionBuilder {
           version: remoteConfig.TemplateVersion,
           context: EventContext
         ) => PromiseLike<any> | any
-      ) =>
-        remoteConfig._onUpdateWithOptions(
-          handler,
-          this.options
-        ) as CloudFunction<remoteConfig.TemplateVersion>,
+      ) => remoteConfig._onUpdateWithOptions(handler, this.options),
     };
   }
 
@@ -485,8 +452,7 @@ export class FunctionBuilder {
        * which will use the default Cloud Storage for Firebase bucket.
        * @param bucket Name of the Google Cloud Storage bucket to listen to.
        */
-      bucket: (bucket?: string) =>
-        storage._bucketWithOptions(this.options, bucket),
+      bucket: (bucket?: string) => storage._bucketWithOptions(this.options, bucket),
 
       /**
        * Handle events related to Cloud Storage objects.
@@ -503,8 +469,7 @@ export class FunctionBuilder {
        * the function.
        */
       topic: (topic: string) => pubsub._topicWithOptions(topic, this.options),
-      schedule: (schedule: string) =>
-        pubsub._scheduleWithOptions(schedule, this.options),
+      schedule: (schedule: string) => pubsub._scheduleWithOptions(schedule, this.options),
     };
   }
 
@@ -513,8 +478,7 @@ export class FunctionBuilder {
       /**
        * Handle events related to Firebase authentication users.
        */
-      user: (userOptions?: auth.UserOptions) =>
-        auth._userWithOptions(this.options, userOptions),
+      user: (userOptions?: auth.UserOptions) => auth._userWithOptions(this.options, userOptions),
     };
   }
 
diff --git a/src/v1/function-configuration.ts b/src/v1/function-configuration.ts
new file mode 100644
index 000000000..bb5e07f8f
--- /dev/null
+++ b/src/v1/function-configuration.ts
@@ -0,0 +1,269 @@
+import { Expression } from "../params";
+import { ResetValue } from "../common/options";
+import { SecretParam } from "../params/types";
+
+export { RESET_VALUE } from "../common/options";
+
+/**
+ * List of all regions supported by Cloud Functions.
+ */
+export const SUPPORTED_REGIONS = [
+  "us-central1",
+  "us-east1",
+  "us-east4",
+  "us-west2",
+  "us-west3",
+  "us-west4",
+  "europe-central2",
+  "europe-west1",
+  "europe-west2",
+  "europe-west3",
+  "europe-west6",
+  "asia-east1",
+  "asia-east2",
+  "asia-northeast1",
+  "asia-northeast2",
+  "asia-northeast3",
+  "asia-south1",
+  "asia-southeast1",
+  "asia-southeast2",
+  "northamerica-northeast1",
+  "southamerica-east1",
+  "australia-southeast1",
+] as const;
+
+/**
+ * Cloud Functions min timeout value.
+ */
+export const MIN_TIMEOUT_SECONDS = 0;
+
+/**
+ * Cloud Functions max timeout value.
+ */
+export const MAX_TIMEOUT_SECONDS = 540;
+
+/**
+ * List of available memory options supported by Cloud Functions.
+ */
+export const VALID_MEMORY_OPTIONS = [
+  "128MB",
+  "256MB",
+  "512MB",
+  "1GB",
+  "2GB",
+  "4GB",
+  "8GB",
+] as const;
+
+/**
+ * List of available options for VpcConnectorEgressSettings.
+ */
+export const VPC_EGRESS_SETTINGS_OPTIONS = [
+  "VPC_CONNECTOR_EGRESS_SETTINGS_UNSPECIFIED",
+  "PRIVATE_RANGES_ONLY",
+  "ALL_TRAFFIC",
+] as const;
+
+/**
+ * List of available options for IngressSettings.
+ */
+export const INGRESS_SETTINGS_OPTIONS = [
+  "INGRESS_SETTINGS_UNSPECIFIED",
+  "ALLOW_ALL",
+  "ALLOW_INTERNAL_ONLY",
+  "ALLOW_INTERNAL_AND_GCLB",
+] as const;
+
+/**
+ * Scheduler retry options. Applies only to scheduled functions.
+ */
+export interface ScheduleRetryConfig {
+  /**
+   * The number of attempts that the system will make to run a job using the exponential backoff procedure described by {@link ScheduleRetryConfig.maxDoublings}.
+   *
+   * @defaultValue 0 (infinite retry)
+   */
+  retryCount?: number | Expression<number> | ResetValue;
+  /**
+   * The time limit for retrying a failed job, measured from time when an execution was first attempted.
+   *
+   * If specified with {@link ScheduleRetryConfig.retryCount}, the job will be retried until both limits are reached.
+   *
+   * @defaultValue 0
+   */
+  maxRetryDuration?: string | Expression<string> | ResetValue;
+  /**
+   * The minimum amount of time to wait before retrying a job after it fails.
+   *
+   * @defaultValue 5 seconds
+   */
+  minBackoffDuration?: string | Expression<string> | ResetValue;
+  /**
+   * The maximum amount of time to wait before retrying a job after it fails.
+   *
+   * @defaultValue 1 hour
+   */
+  maxBackoffDuration?: string | Expression<string> | ResetValue;
+  /**
+   * The max number of backoff doubling applied at each retry.
+   *
+   * @defaultValue 5
+   */
+  maxDoublings?: number | Expression<number> | ResetValue;
+}
+
+/**
+ * Configuration options for scheduled functions.
+ */
+export interface Schedule {
+  /**
+   * Describes the schedule on which the job will be executed.
+   *
+   * The schedule can be either of the following types:
+   *
+   * 1. {@link https://en.wikipedia.org/wiki/Cron#Overview | Crontab}
+   *
+   * 2. English-like {@link https://cloud.google.com/scheduler/docs/configuring/cron-job-schedules | schedule}
+   *
+   * @example
+   * ```
+   * // Crontab schedule
+   * schedule: "0 9 * * 1"` // Every Monday at 09:00 AM
+   *
+   * // English-like schedule
+   * schedule: "every 5 minutes"
+   * ```
+   */
+  schedule: string;
+  /**
+   * Specifies the time zone to be used in interpreting {@link Schedule.schedule}.
+   *
+   * The value of this field must be a time zone name from the tz database.
+   */
+  timeZone?: string | ResetValue;
+  /**
+   * Settings that determine the retry behavior.
+   */
+  retryConfig?: ScheduleRetryConfig;
+}
+
+/**
+ * Configuration option for failure policy on background functions.
+ */
+export interface FailurePolicy {
+  /**
+   * Retry configuration. Must be an empty object.
+   *
+   */
+  retry: Record<string, never>;
+}
+
+export const MAX_NUMBER_USER_LABELS = 58;
+
+/**
+ * Configuration options for a function that applicable at runtime.
+ */
+export interface RuntimeOptions {
+  /**
+   * Which platform should host the backend. Valid options are "gcfv1"
+   * @internal
+   */
+  platform?: "gcfv1";
+
+  /**
+   * Failure policy of the function, with boolean `true` being equivalent to
+   * providing an empty retry object.
+   */
+  failurePolicy?: FailurePolicy | boolean;
+  /**
+   * Amount of memory to allocate to the function.
+   */
+  memory?: typeof VALID_MEMORY_OPTIONS[number] | Expression<number> | ResetValue;
+  /**
+   * Timeout for the function in seconds, possible values are 0 to 540.
+   */
+  timeoutSeconds?: number | Expression<number> | ResetValue;
+
+  /**
+   * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
+   * Instances will be billed for memory allocation and 10% of CPU allocation
+   * while idle.
+   */
+  minInstances?: number | Expression<number> | ResetValue;
+
+  /**
+   * Max number of actual instances allowed to be running in parallel.
+   */
+  maxInstances?: number | Expression<number> | ResetValue;
+
+  /**
+   * Connect cloud function to specified VPC connector.
+   */
+  vpcConnector?: string | ResetValue;
+
+  /**
+   * Egress settings for VPC connector.
+   */
+  vpcConnectorEgressSettings?: typeof VPC_EGRESS_SETTINGS_OPTIONS[number] | ResetValue;
+
+  /**
+   * Specific service account for the function to run as.
+   */
+  serviceAccount?: "default" | string | ResetValue;
+
+  /**
+   * Ingress settings which control where this function can be called from.
+   */
+  ingressSettings?: typeof INGRESS_SETTINGS_OPTIONS[number] | ResetValue;
+
+  /**
+   * User labels to set on the function.
+   */
+  labels?: Record<string, string>;
+
+  /**
+   * Invoker to set access control on https functions.
+   */
+  invoker?: "public" | "private" | string | string[];
+
+  /*
+   * Secrets to bind to a function instance.
+   */
+  secrets?: (string | SecretParam)[];
+
+  /**
+   * Determines whether Firebase AppCheck is enforced.
+   *
+   * @remarks
+   * When true, requests with invalid tokens autorespond with a 401
+   * (Unauthorized) error.
+   * When false, requests with invalid tokens set context.app to undefiend.
+   */
+  enforceAppCheck?: boolean;
+}
+
+/**
+ * Configuration options for a function that applies during function deployment.
+ */
+export interface DeploymentOptions extends RuntimeOptions {
+  /**
+   * Regions where function should be deployed.
+   */
+  regions?: Array<typeof SUPPORTED_REGIONS[number] | string>;
+  /**
+   * Schedule for the scheduled function.
+   */
+  schedule?: Schedule;
+  /**
+   * Controls whether function configuration modified outside of function source is preserved. Defaults to false.
+   *
+   * @remarks
+   * When setting configuration available in the underlying platform that is not yet available in the Firebase Functions
+   * SDK, we highly recommend setting preserveExternalChanges to true. Otherwise, when Firebase Functions SDK releases
+   * a new version of the SDK with the support for the missing configuration, your functions manually configured setting
+   * may inadvertently be wiped out.
+   */
+  preserveExternalChanges?: boolean;
+}
diff --git a/src/v1/handler-builder.ts b/src/v1/handler-builder.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/index.ts b/src/v1/index.ts
similarity index 61%
rename from src/index.ts
rename to src/v1/index.ts
index a77ba3ff9..92b35b341 100644
--- a/src/index.ts
+++ b/src/v1/index.ts
@@ -21,31 +21,25 @@
 // SOFTWARE.
 
 // Providers:
-import * as analytics from './providers/analytics';
-import * as auth from './providers/auth';
-import * as database from './providers/database';
-import * as firestore from './providers/firestore';
-import * as https from './providers/https';
-import * as pubsub from './providers/pubsub';
-import * as remoteConfig from './providers/remoteConfig';
-import * as storage from './providers/storage';
-import * as tasks from './providers/tasks';
-import * as testLab from './providers/testLab';
+import * as logger from "../logger";
+import * as analytics from "./providers/analytics";
+import * as auth from "./providers/auth";
+import * as database from "./providers/database";
+import * as firestore from "./providers/firestore";
+import * as https from "./providers/https";
+import * as pubsub from "./providers/pubsub";
+import * as remoteConfig from "./providers/remoteConfig";
+import * as storage from "./providers/storage";
+import * as tasks from "./providers/tasks";
+import * as testLab from "./providers/testLab";
 
-import * as apps from './apps';
-import { handler } from './handler-builder';
-import * as logger from './logger';
-import { setup } from './setup';
-
-const app = apps.apps();
+import { setApp as setEmulatedAdminApp } from "../common/app";
 
 export {
   analytics,
-  app,
   auth,
   database,
   firestore,
-  handler,
   https,
   pubsub,
   remoteConfig,
@@ -55,10 +49,10 @@ export {
   logger,
 };
 
-// Exported root types:
-export * from './cloud-functions';
-export * from './config';
-export * from './function-builder';
-export * from './function-configuration';
+export const app = { setEmulatedAdminApp };
 
-setup();
+// Exported root types:
+export * from "./cloud-functions";
+export * from "./config";
+export * from "./function-builder";
+export * from "./function-configuration";
diff --git a/src/providers/analytics.ts b/src/v1/providers/analytics.ts
similarity index 76%
rename from src/providers/analytics.ts
rename to src/v1/providers/analytics.ts
index 2d57d6f5e..63895a7ca 100644
--- a/src/providers/analytics.ts
+++ b/src/v1/providers/analytics.ts
@@ -20,20 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as _ from 'lodash';
+import { CloudFunction, Event, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
 
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { DeploymentOptions } from '../function-configuration';
-
-/** @hidden */
-export const provider = 'google.analytics';
-/** @hidden */
-export const service = 'app-measurement.com';
+/** @internal */
+export const provider = "google.analytics";
+/** @internal */
+export const service = "app-measurement.com";
 
 /**
  * Registers a function to handle analytics events.
@@ -41,38 +34,30 @@ export const service = 'app-measurement.com';
  * @param analyticsEventType Name of the analytics event type to which
  *   this Cloud Function is scoped.
  *
- * @return Analytics event builder interface.
+ * @returns Analytics event builder interface.
  */
 export function event(analyticsEventType: string) {
   return _eventWithOptions(analyticsEventType, {});
 }
 
-/** @hidden */
-export function _eventWithOptions(
-  analyticsEventType: string,
-  options: DeploymentOptions
-) {
+/** @internal */
+export function _eventWithOptions(analyticsEventType: string, options: DeploymentOptions) {
   return new AnalyticsEventBuilder(() => {
     if (!process.env.GCLOUD_PROJECT) {
-      throw new Error('process.env.GCLOUD_PROJECT is not set.');
+      throw new Error("process.env.GCLOUD_PROJECT is not set.");
     }
-    return (
-      'projects/' + process.env.GCLOUD_PROJECT + '/events/' + analyticsEventType
-    );
+    return "projects/" + process.env.GCLOUD_PROJECT + "/events/" + analyticsEventType;
   }, options);
 }
 
 /**
  * The Firebase Analytics event builder interface.
  *
- * Access via [`functions.analytics.event()`](functions.analytics#.event).
+ * Access via `functions.analytics.event()`.
  */
 export class AnalyticsEventBuilder {
   /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Event handler that fires every time a Firebase Analytics event occurs.
@@ -80,13 +65,10 @@ export class AnalyticsEventBuilder {
    * @param handler Event handler that fires every time a Firebase Analytics event
    *   occurs.
    *
-   * @return A function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onLog(
-    handler: (
-      event: AnalyticsEvent,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (event: AnalyticsEvent, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<AnalyticsEvent> {
     const dataConstructor = (raw: Event) => {
       return new AnalyticsEvent(raw.data);
@@ -94,7 +76,7 @@ export class AnalyticsEventBuilder {
     return makeCloudFunction({
       handler,
       provider,
-      eventType: 'event.log',
+      eventType: "event.log",
       service,
       legacyEventType: `providers/google.firebase.analytics/eventTypes/event.log`,
       triggerResource: this.triggerResource,
@@ -142,25 +124,14 @@ export class AnalyticsEvent {
     if (wireFormat.eventDim && wireFormat.eventDim.length > 0) {
       // If there's an eventDim, there'll always be exactly one.
       const eventDim = wireFormat.eventDim[0];
-      copyField(eventDim, this, 'name');
-      copyField(eventDim, this, 'params', (p) => _.mapValues(p, unwrapValue));
-      copyFieldTo(eventDim, this, 'valueInUsd', 'valueInUSD');
-      copyFieldTo(eventDim, this, 'date', 'reportingDate');
-      copyTimestampToString(eventDim, this, 'timestampMicros', 'logTime');
-      copyTimestampToString(
-        eventDim,
-        this,
-        'previousTimestampMicros',
-        'previousLogTime'
-      );
+      copyField(eventDim, this, "name");
+      copyField(eventDim, this, "params", (p) => mapKeys(p, unwrapValue));
+      copyFieldTo(eventDim, this, "valueInUsd", "valueInUSD");
+      copyFieldTo(eventDim, this, "date", "reportingDate");
+      copyTimestampToString(eventDim, this, "timestampMicros", "logTime");
+      copyTimestampToString(eventDim, this, "previousTimestampMicros", "previousLogTime");
     }
-    copyFieldTo(
-      wireFormat,
-      this,
-      'userDim',
-      'user',
-      (dim) => new UserDimensions(dim)
-    );
+    copyFieldTo(wireFormat, this, "userDim", "user", (dim) => new UserDimensions(dim));
   }
 }
 
@@ -203,30 +174,21 @@ export class UserDimensions {
   /** @hidden */
   constructor(wireFormat: any) {
     // These are interfaces or primitives, no transformation needed.
-    copyFields(wireFormat, this, [
-      'userId',
-      'deviceInfo',
-      'geoInfo',
-      'appInfo',
-    ]);
+    copyFields(wireFormat, this, ["userId", "deviceInfo", "geoInfo", "appInfo"]);
 
     // The following fields do need transformations of some sort.
-    copyTimestampToString(
-      wireFormat,
-      this,
-      'firstOpenTimestampMicros',
-      'firstOpenTime'
-    );
+    copyTimestampToString(wireFormat, this, "firstOpenTimestampMicros", "firstOpenTime");
     this.userProperties = {}; // With no entries in the wire format, present an empty (as opposed to absent) map.
-    copyField(wireFormat, this, 'userProperties', (r) =>
-      _.mapValues(r, (p) => new UserPropertyValue(p))
-    );
-    copyField(wireFormat, this, 'bundleInfo', (r) => new ExportBundleInfo(r));
+    copyField(wireFormat, this, "userProperties", (r) => {
+      const entries = Object.entries(r).map(([k, v]) => [k, new UserPropertyValue(v)]);
+      return Object.fromEntries(entries);
+    });
+    copyField(wireFormat, this, "bundleInfo", (r) => new ExportBundleInfo(r) as any);
 
     // BUG(36000368) Remove when no longer necessary
     /* tslint:disable:no-string-literal */
-    if (!this.userId && this.userProperties['user_id']) {
-      this.userId = this.userProperties['user_id'].value;
+    if (!this.userId && this.userProperties["user_id"]) {
+      this.userId = this.userProperties["user_id"].value;
     }
     /* tslint:enable:no-string-literal */
   }
@@ -242,8 +204,8 @@ export class UserPropertyValue {
 
   /** @hidden */
   constructor(wireFormat: any) {
-    copyField(wireFormat, this, 'value', unwrapValueAsString);
-    copyTimestampToString(wireFormat, this, 'setTimestampUsec', 'setTime');
+    copyField(wireFormat, this, "value", unwrapValueAsString as any);
+    copyTimestampToString(wireFormat, this, "setTimestampUsec", "setTime");
   }
 }
 
@@ -407,46 +369,61 @@ export class ExportBundleInfo {
 
   /** @hidden */
   constructor(wireFormat: any) {
-    copyField(wireFormat, this, 'bundleSequenceId');
-    copyTimestampToMillis(
-      wireFormat,
-      this,
-      'serverTimestampOffsetMicros',
-      'serverTimestampOffset'
-    );
+    copyField(wireFormat, this, "bundleSequenceId");
+    copyTimestampToMillis(wireFormat, this, "serverTimestampOffsetMicros", "serverTimestampOffset");
   }
 }
 
 /** @hidden */
-function copyFieldTo<T, K extends keyof T>(
-  from: any,
-  to: T,
-  fromField: string,
-  toField: K,
-  transform: (val: any) => T[K] = _.identity
+function copyFieldTo<From extends object, FromKey extends keyof From, To, ToKey extends keyof To>(
+  from: From,
+  to: To,
+  fromField: FromKey,
+  toField: ToKey,
+  transform?: (val: Required<From>[FromKey]) => Required<To>[ToKey]
 ): void {
-  if (from[fromField] !== undefined) {
+  if (typeof from[fromField] === "undefined") {
+    return;
+  }
+  if (transform) {
     to[toField] = transform(from[fromField]);
+    return;
   }
+  to[toField] = from[fromField] as any;
 }
 
 /** @hidden */
-function copyField<T, K extends keyof T>(
-  from: any,
-  to: T,
-  field: K,
-  transform: (val: any) => T[K] = _.identity
+function copyField<From extends object, To, Key extends keyof From & keyof To>(
+  from: From,
+  to: To,
+  field: Key,
+  transform: (val: Required<From>[Key]) => Required<To>[Key] = (from) => from as any
 ): void {
-  copyFieldTo(from, to, field as string, field, transform);
+  copyFieldTo(from, to, field, field, transform);
 }
 
 /** @hidden */
-function copyFields<T, K extends keyof T>(from: any, to: T, fields: K[]): void {
+function copyFields<From extends object, To, Key extends keyof From & keyof To>(
+  from: From,
+  to: To,
+  fields: Key[]
+): void {
   for (const field of fields) {
     copyField(from, to, field);
   }
 }
 
+type TransformedObject<Obj, Transform extends (key: keyof Obj) => any> = {
+  [key in keyof Obj]: ReturnType<Transform>;
+};
+function mapKeys<Obj, Transform extends (key: keyof Obj) => any>(
+  obj: Obj,
+  transform: Transform
+): TransformedObject<Obj, Transform> {
+  const entries = Object.entries(obj).map(([k, v]) => [k, transform(v)]);
+  return Object.fromEntries(entries);
+}
+
 // The incoming payload will have fields like:
 // {
 //   'myInt': {
@@ -478,8 +455,8 @@ function copyFields<T, K extends keyof T>(from: any, to: T, fields: K[]): void {
 // 'unwrapValue' method just below.
 /** @hidden */
 function unwrapValueAsString(wrapped: any): string {
-  const key: string = _.keys(wrapped)[0];
-  return _.toString(wrapped[key]);
+  const key: string = Object.keys(wrapped)[0];
+  return wrapped[key].toString();
 }
 
 // Ditto as the method above, but returning the values in the idiomatic JavaScript type (string for strings,
@@ -496,13 +473,13 @@ function unwrapValueAsString(wrapped: any): string {
 // JavaScript's 'number' type, since we prefer using idiomatic types. Note that this may lead to loss
 // in precision for int64 fields, so use with care.
 /** @hidden */
-const xValueNumberFields = ['intValue', 'floatValue', 'doubleValue'];
+const xValueNumberFields = ["intValue", "floatValue", "doubleValue"];
 
 /** @hidden */
 function unwrapValue(wrapped: any): any {
-  const key: string = _.keys(wrapped)[0];
+  const key: string = Object.keys(wrapped)[0];
   const value: string = unwrapValueAsString(wrapped);
-  return _.includes(xValueNumberFields, key) ? _.toNumber(value) : value;
+  return xValueNumberFields.includes(key) ? Number(value) : value;
 }
 
 // The JSON payload delivers timestamp fields as strings of timestamps denoted in microseconds.
@@ -516,7 +493,7 @@ function copyTimestampToMillis<T, K extends keyof T>(
   toName: K
 ) {
   if (from[fromName] !== undefined) {
-    to[toName] = _.round(from[fromName] / 1000) as any;
+    to[toName] = Math.round(from[fromName] / 1000) as any;
   }
 }
 
diff --git a/src/providers/auth.ts b/src/v1/providers/auth.ts
similarity index 69%
rename from src/providers/auth.ts
rename to src/v1/providers/auth.ts
index f845424ea..8ec455a8b 100644
--- a/src/providers/auth.ts
+++ b/src/v1/providers/auth.ts
@@ -20,15 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import {
-  BlockingFunction,
-  CloudFunction,
-  Event,
-  EventContext,
-  makeCloudFunction,
-  optionsToEndpoint,
-  optionsToTrigger,
-} from '../cloud-functions';
 import {
   AuthBlockingEventType,
   AuthEventContext,
@@ -41,22 +32,30 @@ import {
   userRecordConstructor,
   UserRecordMetadata,
   wrapHandler,
-} from '../common/providers/identity';
-import { DeploymentOptions } from '../function-configuration';
+} from "../../common/providers/identity";
+import {
+  BlockingFunction,
+  CloudFunction,
+  Event,
+  EventContext,
+  makeCloudFunction,
+  optionsToEndpoint,
+} from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
+import { initV1Endpoint } from "../../runtime/manifest";
 
 // TODO: yank in next breaking change release
 export { UserRecord, UserInfo, UserRecordMetadata, userRecordConstructor };
 
 export { HttpsError };
 
-/** @hidden */
-export const provider = 'google.firebase.auth';
-/** @hidden */
-export const service = 'firebaseauth.googleapis.com';
+/** @internal */
+export const provider = "google.firebase.auth";
+/** @internal */
+export const service = "firebaseauth.googleapis.com";
 
 /**
- * Resource level options
- * @public
+ * Options for Auth blocking function.
  */
 export interface UserOptions {
   /** Options to set configuration at the resource level for blocking functions. */
@@ -73,26 +72,25 @@ export interface UserOptions {
 }
 
 /**
- * Handles events related to Firebase authentication users.
+ * Handles events related to Firebase Auth users events.
+ *
  * @param userOptions - Resource level options
- * @returns UserBuilder - Builder used to create Cloud Functions for Firebase Auth user lifecycle events
+ * @returns UserBuilder - Builder used to create functions for Firebase Auth user lifecycle events
+ *
  * @public
  */
 export function user(userOptions?: UserOptions): UserBuilder {
   return _userWithOptions({}, userOptions || {});
 }
 
-/** @hidden */
-export function _userWithOptions(
-  options: DeploymentOptions,
-  userOptions: UserOptions
-) {
+/** @internal */
+export function _userWithOptions(options: DeploymentOptions, userOptions: UserOptions) {
   return new UserBuilder(
     () => {
       if (!process.env.GCLOUD_PROJECT) {
-        throw new Error('process.env.GCLOUD_PROJECT is not set.');
+        throw new Error("process.env.GCLOUD_PROJECT is not set.");
       }
-      return 'projects/' + process.env.GCLOUD_PROJECT;
+      return "projects/" + process.env.GCLOUD_PROJECT;
     },
     options,
     userOptions
@@ -100,7 +98,7 @@ export function _userWithOptions(
 }
 
 /**
- * Builder used to create Cloud Functions for Firebase Auth user lifecycle events.
+ * Builder used to create functions for Firebase Auth user lifecycle events.
  * @public
  */
 export class UserBuilder {
@@ -108,7 +106,7 @@ export class UserBuilder {
     return userRecordConstructor(raw.data);
   }
 
-  /** @hidden */
+  /* @internal */
   constructor(
     private triggerResource: () => string,
     private options: DeploymentOptions,
@@ -117,56 +115,64 @@ export class UserBuilder {
 
   /**
    * Responds to the creation of a Firebase Auth user.
+   *
+   * @param handler Event handler that responds to the creation of a Firebase Auth user.
+   *
    * @public
    */
   onCreate(
     handler: (user: UserRecord, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<UserRecord> {
-    return this.onOperation(handler, 'user.create');
+    return this.onOperation(handler, "user.create");
   }
 
   /**
    * Responds to the deletion of a Firebase Auth user.
+   *
+   * @param handler Event handler that responds to the deletion of a Firebase Auth user.
+   *
    * @public
    */
   onDelete(
     handler: (user: UserRecord, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<UserRecord> {
-    return this.onOperation(handler, 'user.delete');
+    return this.onOperation(handler, "user.delete");
   }
 
+  /**
+   * Blocks request to create a Firebase Auth user.
+   *
+   * @param handler Event handler that blocks creation of a Firebase Auth user.
+   *
+   * @public
+   */
   beforeCreate(
     handler: (
       user: AuthUserRecord,
       context: AuthEventContext
-    ) =>
-      | BeforeCreateResponse
-      | void
-      | Promise<BeforeCreateResponse>
-      | Promise<void>
+    ) => BeforeCreateResponse | void | Promise<BeforeCreateResponse> | Promise<void>
   ): BlockingFunction {
-    return this.beforeOperation(handler, 'beforeCreate');
+    return this.beforeOperation(handler, "beforeCreate");
   }
 
+  /**
+   * Blocks request to sign-in a Firebase Auth user.
+   *
+   * @param handler Event handler that blocks sign-in of a Firebase Auth user.
+   *
+   * @public
+   */
   beforeSignIn(
     handler: (
       user: AuthUserRecord,
       context: AuthEventContext
-    ) =>
-      | BeforeSignInResponse
-      | void
-      | Promise<BeforeSignInResponse>
-      | Promise<void>
+    ) => BeforeSignInResponse | void | Promise<BeforeSignInResponse> | Promise<void>
   ): BlockingFunction {
-    return this.beforeOperation(handler, 'beforeSignIn');
+    return this.beforeOperation(handler, "beforeSignIn");
   }
 
-  /** @hidden */
   private onOperation(
-    handler: (
-      user: UserRecord,
-      context: EventContext
-    ) => PromiseLike<any> | any,
+    handler: (user: UserRecord, context: EventContext) => PromiseLike<any> | any,
     eventType: string
   ): CloudFunction<UserRecord> {
     return makeCloudFunction({
@@ -175,13 +181,13 @@ export class UserBuilder {
       eventType,
       service,
       triggerResource: this.triggerResource,
+      // eslint-disable-next-line @typescript-eslint/unbound-method
       dataConstructor: UserBuilder.dataConstructor,
       legacyEventType: `providers/firebase.auth/eventTypes/${eventType}`,
       options: this.options,
     });
   }
 
-  /** @hidden */
   private beforeOperation(
     handler: (
       user: AuthUserRecord,
@@ -197,8 +203,7 @@ export class UserBuilder {
   ): BlockingFunction {
     const accessToken = this.userOptions?.blockingOptions?.accessToken || false;
     const idToken = this.userOptions?.blockingOptions?.idToken || false;
-    const refreshToken =
-      this.userOptions?.blockingOptions?.refreshToken || false;
+    const refreshToken = this.userOptions?.blockingOptions?.refreshToken || false;
 
     // Create our own function that just calls the provided function so we know for sure that
     // handler takes two arguments. This is something common/providers/identity depends on.
@@ -208,22 +213,10 @@ export class UserBuilder {
 
     const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`;
 
-    func.__trigger = {
-      labels: {},
-      ...optionsToTrigger(this.options),
-      blockingTrigger: {
-        eventType: legacyEventType,
-        options: {
-          accessToken,
-          idToken,
-          refreshToken,
-        },
-      },
-    };
-
     func.__endpoint = {
-      platform: 'gcfv1',
+      platform: "gcfv1",
       labels: {},
+      ...initV1Endpoint(this.options),
       ...optionsToEndpoint(this.options),
       blockingTrigger: {
         eventType: legacyEventType,
@@ -237,8 +230,8 @@ export class UserBuilder {
 
     func.__requiredAPIs = [
       {
-        api: 'identitytoolkit.googleapis.com',
-        reason: 'Needed for auth blocking functions',
+        api: "identitytoolkit.googleapis.com",
+        reason: "Needed for auth blocking functions",
       },
     ];
 
diff --git a/src/providers/database.ts b/src/v1/providers/database.ts
similarity index 73%
rename from src/providers/database.ts
rename to src/v1/providers/database.ts
index 39feaf0e8..d59d7de19 100644
--- a/src/providers/database.ts
+++ b/src/v1/providers/database.ts
@@ -20,34 +20,31 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { apps } from '../apps';
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { Change } from '../common/change';
-import { DataSnapshot } from '../common/providers/database';
-import { firebaseConfig } from '../config';
-import { DeploymentOptions } from '../function-configuration';
-import { normalizePath } from '../utilities/path';
-import { applyChange } from '../utils';
+import { getApp } from "../../common/app";
+import { Change } from "../../common/change";
+import { firebaseConfig } from "../../common/config";
+import { ParamsOf } from "../../common/params";
+import { DataSnapshot } from "../../common/providers/database";
+import { normalizePath } from "../../common/utilities/path";
+import { applyChange } from "../../common/utilities/utils";
+import { CloudFunction, Event, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
 
 export { DataSnapshot };
 
-/** @hidden */
-export const provider = 'google.firebase.database';
-/** @hidden */
-export const service = 'firebaseio.com';
+/** @internal */
+export const provider = "google.firebase.database";
+/** @internal */
+export const service = "firebaseio.com";
 
-const databaseURLRegex = new RegExp('^https://([^.]+).');
-const emulatorDatabaseURLRegex = new RegExp('^http://.*ns=([^&]+)');
+const databaseURLRegex = new RegExp("^https://([^.]+).");
+const emulatorDatabaseURLRegex = new RegExp("^http://.*ns=([^&]+)");
 
 /**
  * Registers a function that triggers on events from a specific
  * Firebase Realtime Database instance.
  *
+ * @remarks
  * Use this method together with `ref` to specify the instance on which to
  * watch for database events. For example: `firebase.database.instance('my-app-db-2').ref('/foo/bar')`
  *
@@ -56,7 +53,7 @@ const emulatorDatabaseURLRegex = new RegExp('^http://.*ns=([^&]+)');
  *
  * @param instance The instance name of the database instance
  *   to watch for write events.
- * @return Firebase Realtime Database instance builder interface.
+ * @returns Firebase Realtime Database instance builder interface.
  */
 export function instance(instance: string) {
   return _instanceWithOptions(instance, {});
@@ -66,6 +63,7 @@ export function instance(instance: string) {
  * Registers a function that triggers on Firebase Realtime Database write
  * events.
  *
+ * @remarks
  * This method behaves very similarly to the method of the same name in the
  * client and Admin Firebase SDKs. Any change to the Database that affects the
  * data at or below the provided `path` will fire an event in Cloud Functions.
@@ -73,6 +71,7 @@ export function instance(instance: string) {
  * There are three important differences between listening to a Realtime
  * Database event in Cloud Functions and using the Realtime Database in the
  * client and Admin SDKs:
+ *
  * 1. Cloud Functions allows wildcards in the `path` name. Any `path` component
  *    in curly brackets (`{}`) is a wildcard that matches all strings. The value
  *    that matched a certain invocation of a Cloud Function is returned as part
@@ -81,20 +80,22 @@ export function instance(instance: string) {
  *    `/messages/message1` or `/messages/message2`, resulting in
  *    `event.params.messageId` being set to `"message1"` or `"message2"`,
  *    respectively.
+ *
  * 2. Cloud Functions do not fire an event for data that already existed before
  *    the Cloud Function was deployed.
+ *
  * 3. Cloud Function events have access to more information, including a
  *    snapshot of the previous event data and information about the user who
  *    triggered the Cloud Function.
  *
  * @param path The path within the Database to watch for write events.
- * @return Firebase Realtime Database builder interface.
+ * @returns Firebase Realtime Database builder interface.
  */
-export function ref(path: string) {
+export function ref<Ref extends string>(path: Ref) {
   return _refWithOptions(path, {});
 }
 
-/** @hidden */
+/** @internal */
 export function _instanceWithOptions(
   instance: string,
   options: DeploymentOptions
@@ -108,36 +109,34 @@ export function _instanceWithOptions(
  * Access via [`database.instance()`](providers_database_.html#instance).
  */
 export class InstanceBuilder {
-  /** @hidden */
   constructor(private instance: string, private options: DeploymentOptions) {}
 
   /**
-   * @return Firebase Realtime Database reference builder interface.
+   * @returns Firebase Realtime Database reference builder interface.
    */
-  ref(path: string): RefBuilder {
+  ref<Ref extends string>(path: Ref): RefBuilder<Ref> {
     const normalized = normalizePath(path);
-    return new RefBuilder(
-      apps(),
+    return new RefBuilder<Ref>(
       () => `projects/_/instances/${this.instance}/refs/${normalized}`,
       this.options
     );
   }
 }
 
-/** @hidden */
-export function _refWithOptions(
-  path: string,
+/** @internal */
+export function _refWithOptions<Ref extends string>(
+  path: Ref,
   options: DeploymentOptions
-): RefBuilder {
+): RefBuilder<Ref> {
   const resourceGetter = () => {
     const normalized = normalizePath(path);
     const databaseURL = firebaseConfig().databaseURL;
     if (!databaseURL) {
       throw new Error(
-        'Missing expected firebase config value databaseURL, ' +
-          'config is actually' +
+        "Missing expected firebase config value databaseURL, " +
+          "config is actually" +
           JSON.stringify(firebaseConfig()) +
-          '\n If you are unit testing, please set process.env.FIREBASE_CONFIG'
+          "\n If you are unit testing, please set process.env.FIREBASE_CONFIG"
       );
     }
 
@@ -153,15 +152,13 @@ export function _refWithOptions(
     }
 
     if (!instance) {
-      throw new Error(
-        'Invalid value for config firebase.databaseURL: ' + databaseURL
-      );
+      throw new Error("Invalid value for config firebase.databaseURL: " + databaseURL);
     }
 
     return `projects/_/instances/${instance}/refs/${normalized}`;
   };
 
-  return new RefBuilder(apps(), resourceGetter, options);
+  return new RefBuilder<Ref>(resourceGetter, options);
 }
 
 /**
@@ -169,13 +166,8 @@ export function _refWithOptions(
  *
  * Access via [`functions.database.ref()`](functions.database#.ref).
  */
-export class RefBuilder {
-  /** @hidden */
-  constructor(
-    private apps: apps.Apps,
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+export class RefBuilder<Ref extends string> {
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Event handler that fires every time a Firebase Realtime Database write
@@ -183,15 +175,15 @@ export class RefBuilder {
    *
    * @param handler Event handler that runs every time a Firebase Realtime Database
    *   write occurs.
-   * @return A Cloud Function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onWrite(
     handler: (
       change: Change<DataSnapshot>,
-      context: EventContext
+      context: EventContext<ParamsOf<Ref>>
     ) => PromiseLike<any> | any
   ): CloudFunction<Change<DataSnapshot>> {
-    return this.onOperation(handler, 'ref.write', this.changeConstructor);
+    return this.onOperation(handler, "ref.write", this.changeConstructor);
   }
 
   /**
@@ -200,16 +192,15 @@ export class RefBuilder {
    *
    * @param handler Event handler which is run every time a Firebase Realtime Database
    *   write occurs.
-   * @return A Cloud
-   *   Function which you can export and deploy.
+   * @returns A function which you can export and deploy.
    */
   onUpdate(
     handler: (
       change: Change<DataSnapshot>,
-      context: EventContext
+      context: EventContext<ParamsOf<Ref>>
     ) => PromiseLike<any> | any
   ): CloudFunction<Change<DataSnapshot>> {
-    return this.onOperation(handler, 'ref.update', this.changeConstructor);
+    return this.onOperation(handler, "ref.update", this.changeConstructor);
   }
 
   /**
@@ -218,12 +209,12 @@ export class RefBuilder {
    *
    * @param handler Event handler that runs every time new data is created in
    *   Firebase Realtime Database.
-   * @return A Cloud Function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onCreate(
     handler: (
       snapshot: DataSnapshot,
-      context: EventContext
+      context: EventContext<ParamsOf<Ref>>
     ) => PromiseLike<any> | any
   ): CloudFunction<DataSnapshot> {
     const dataConstructor = (raw: Event) => {
@@ -231,14 +222,9 @@ export class RefBuilder {
         raw.context.resource.name,
         raw.context.domain
       );
-      return new DataSnapshot(
-        raw.data.delta,
-        path,
-        this.apps.admin,
-        dbInstance
-      );
+      return new DataSnapshot(raw.data.delta, path, getApp(), dbInstance);
     };
-    return this.onOperation(handler, 'ref.create', dataConstructor);
+    return this.onOperation(handler, "ref.create", dataConstructor);
   }
 
   /**
@@ -247,12 +233,12 @@ export class RefBuilder {
    *
    * @param handler Event handler that runs every time data is deleted from
    *   Firebase Realtime Database.
-   * @return A Cloud Function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onDelete(
     handler: (
       snapshot: DataSnapshot,
-      context: EventContext
+      context: EventContext<ParamsOf<Ref>>
     ) => PromiseLike<any> | any
   ): CloudFunction<DataSnapshot> {
     const dataConstructor = (raw: Event) => {
@@ -260,9 +246,9 @@ export class RefBuilder {
         raw.context.resource.name,
         raw.context.domain
       );
-      return new DataSnapshot(raw.data.data, path, this.apps.admin, dbInstance);
+      return new DataSnapshot(raw.data.data, path, getApp(), dbInstance);
     };
-    return this.onOperation(handler, 'ref.delete', dataConstructor);
+    return this.onOperation(handler, "ref.delete", dataConstructor);
   }
 
   private onOperation<T>(
@@ -278,8 +264,6 @@ export class RefBuilder {
       legacyEventType: `providers/${provider}/eventTypes/${eventType}`,
       triggerResource: this.triggerResource,
       dataConstructor,
-      before: (event) => this.apps.retain(),
-      after: (event) => this.apps.release(),
       options: this.options,
     });
   }
@@ -289,16 +273,11 @@ export class RefBuilder {
       raw.context.resource.name,
       raw.context.domain
     );
-    const before = new DataSnapshot(
-      raw.data.data,
-      path,
-      this.apps.admin,
-      dbInstance
-    );
+    const before = new DataSnapshot(raw.data.data, path, getApp(), dbInstance);
     const after = new DataSnapshot(
       applyChange(raw.data.data, raw.data.delta),
       path,
-      this.apps.admin,
+      getApp(),
       dbInstance
     );
     return {
@@ -317,12 +296,10 @@ const resourceRegex = /^projects\/([^/]+)\/instances\/([a-zA-Z0-9-]+)\/refs(\/.+
  *    It defaults to `firebaseio.com`.
  *    Multi-region RTDB will be served from different domains.
  *    Since region is not part of the resource name, it is provided through context.
+ *
+ * @internal
  */
-/** @hidden */
-export function extractInstanceAndPath(
-  resource: string,
-  domain = 'firebaseio.com'
-) {
+export function extractInstanceAndPath(resource: string, domain = "firebaseio.com") {
   const match = resource.match(new RegExp(resourceRegex));
   if (!match) {
     throw new Error(
@@ -331,10 +308,8 @@ export function extractInstanceAndPath(
     );
   }
   const [, project, dbInstanceName, path] = match;
-  if (project !== '_') {
-    throw new Error(
-      `Expect project to be '_' in a Firebase Realtime Database event`
-    );
+  if (project !== "_") {
+    throw new Error(`Expect project to be '_' in a Firebase Realtime Database event`);
   }
 
   const emuHost = process.env.FIREBASE_DATABASE_EMULATOR_HOST;
@@ -342,7 +317,7 @@ export function extractInstanceAndPath(
     const dbInstance = `http://${emuHost}/?ns=${dbInstanceName}`;
     return [dbInstance, path];
   } else {
-    const dbInstance = 'https://' + dbInstanceName + '.' + domain;
+    const dbInstance = "https://" + dbInstanceName + "." + domain;
     return [dbInstance, path];
   }
 }
diff --git a/src/providers/firestore.ts b/src/v1/providers/firestore.ts
similarity index 60%
rename from src/providers/firestore.ts
rename to src/v1/providers/firestore.ts
index 73d8eed13..57ccf4603 100644
--- a/src/providers/firestore.ts
+++ b/src/v1/providers/firestore.ts
@@ -20,31 +20,26 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as firebase from 'firebase-admin';
-import * as _ from 'lodash';
-
-import { posix } from 'path';
-import { apps } from '../apps';
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { Change } from '../common/change';
-import { dateToTimestampProto } from '../encoder';
-import { DeploymentOptions } from '../function-configuration';
-import * as logger from '../logger';
-
-/** @hidden */
-export const provider = 'google.firestore';
-/** @hidden */
-export const service = 'firestore.googleapis.com';
-/** @hidden */
-export const defaultDatabase = '(default)';
+import * as firestore from "firebase-admin/firestore";
+
+import { posix } from "path";
+import { getApp } from "../../common/app";
+import { Change } from "../../common/change";
+import { ParamsOf } from "../../common/params";
+import { dateToTimestampProto } from "../../common/utilities/encoder";
+import * as logger from "../../logger";
+import { CloudFunction, Event, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
+
+/** @internal */
+export const provider = "google.firestore";
+/** @internal */
+export const service = "firestore.googleapis.com";
+/** @internal */
+export const defaultDatabase = "(default)";
 let firestoreInstance: any;
-export type DocumentSnapshot = firebase.firestore.DocumentSnapshot;
-export type QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
+export type DocumentSnapshot = firestore.DocumentSnapshot;
+export type QueryDocumentSnapshot = firestore.QueryDocumentSnapshot;
 
 /**
  * Select the Firestore document to listen to for events.
@@ -53,21 +48,21 @@ export type QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
  * collection is named "users" and the document is named "Ada", then the
  * path is "/users/Ada".
  */
-export function document(path: string) {
+export function document<Path extends string>(path: Path) {
   return _documentWithOptions(path, {});
 }
-/** @hidden */
+
 // Multiple namespaces are not yet supported by Firestore.
 export function namespace(namespace: string) {
   return _namespaceWithOptions(namespace, {});
 }
-/** @hidden */
+
 // Multiple databases are not yet supported by Firestore.
 export function database(database: string) {
   return _databaseWithOptions(database, {});
 }
 
-/** @hidden */
+/** @internal */
 export function _databaseWithOptions(
   database: string = defaultDatabase,
   options: DeploymentOptions
@@ -75,54 +70,49 @@ export function _databaseWithOptions(
   return new DatabaseBuilder(database, options);
 }
 
-/** @hidden */
-export function _namespaceWithOptions(
-  namespace: string,
-  options: DeploymentOptions
-) {
+/** @internal */
+export function _namespaceWithOptions(namespace: string, options: DeploymentOptions) {
   return _databaseWithOptions(defaultDatabase, options).namespace(namespace);
 }
 
-/** @hidden */
-export function _documentWithOptions(path: string, options: DeploymentOptions) {
+/** @internal */
+export function _documentWithOptions<Path extends string>(path: Path, options: DeploymentOptions) {
   return _databaseWithOptions(defaultDatabase, options).document(path);
 }
 
 export class DatabaseBuilder {
-  /** @hidden */
   constructor(private database: string, private options: DeploymentOptions) {}
 
   namespace(namespace: string) {
     return new NamespaceBuilder(this.database, this.options, namespace);
   }
 
-  document(path: string) {
+  document<Path extends string>(path: Path) {
     return new NamespaceBuilder(this.database, this.options).document(path);
   }
 }
 
 export class NamespaceBuilder {
-  /** @hidden */
   constructor(
     private database: string,
     private options: DeploymentOptions,
     private namespace?: string
   ) {}
 
-  document(path: string) {
-    return new DocumentBuilder(() => {
+  document<Path extends string>(path: Path) {
+    return new DocumentBuilder<Path>(() => {
       if (!process.env.GCLOUD_PROJECT) {
-        throw new Error('process.env.GCLOUD_PROJECT is not set.');
+        throw new Error("process.env.GCLOUD_PROJECT is not set.");
       }
       const database = posix.join(
-        'projects',
+        "projects",
         process.env.GCLOUD_PROJECT,
-        'databases',
+        "databases",
         this.database
       );
       return posix.join(
         database,
-        this.namespace ? `documents@${this.namespace}` : 'documents',
+        this.namespace ? `documents@${this.namespace}` : "documents",
         path
       );
     }, this.options);
@@ -130,76 +120,56 @@ export class NamespaceBuilder {
 }
 
 function _getValueProto(data: any, resource: string, valueFieldName: string) {
-  if (_.isEmpty(_.get(data, valueFieldName))) {
+  const value = data?.[valueFieldName];
+  if (
+    typeof value === "undefined" ||
+    value === null ||
+    (typeof value === "object" && !Object.keys(value).length)
+  ) {
     // Firestore#snapshot_ takes resource string instead of proto for a non-existent snapshot
     return resource;
   }
   const proto = {
-    fields: _.get(data, [valueFieldName, 'fields'], {}),
-    createTime: dateToTimestampProto(
-      _.get(data, [valueFieldName, 'createTime'])
-    ),
-    updateTime: dateToTimestampProto(
-      _.get(data, [valueFieldName, 'updateTime'])
-    ),
-    name: _.get(data, [valueFieldName, 'name'], resource),
+    fields: value?.fields || {},
+    createTime: dateToTimestampProto(value?.createTime),
+    updateTime: dateToTimestampProto(value?.updateTime),
+    name: value?.name || resource,
   };
   return proto;
 }
 
-/** @hidden */
 export function snapshotConstructor(event: Event): DocumentSnapshot {
   if (!firestoreInstance) {
-    firestoreInstance = firebase.firestore(apps().admin);
+    firestoreInstance = firestore.getFirestore(getApp());
   }
-  const valueProto = _getValueProto(
-    event.data,
-    event.context.resource.name,
-    'value'
-  );
-  let timeString =
-    _.get(event, 'data.value.readTime') ??
-    _.get(event, 'data.value.updateTime');
+  const valueProto = _getValueProto(event.data, event.context.resource.name, "value");
+  let timeString = event?.data?.value?.readTime ?? event?.data?.value?.updateTime;
 
   if (!timeString) {
-    logger.warn('Snapshot has no readTime. Using now()');
+    logger.warn("Snapshot has no readTime. Using now()");
     timeString = new Date().toISOString();
   }
 
   const readTime = dateToTimestampProto(timeString);
-  return firestoreInstance.snapshot_(valueProto, readTime, 'json');
+  return firestoreInstance.snapshot_(valueProto, readTime, "json");
 }
 
-/** @hidden */
 // TODO remove this function when wire format changes to new format
 export function beforeSnapshotConstructor(event: Event): DocumentSnapshot {
   if (!firestoreInstance) {
-    firestoreInstance = firebase.firestore(apps().admin);
+    firestoreInstance = firestore.getFirestore(getApp());
   }
-  const oldValueProto = _getValueProto(
-    event.data,
-    event.context.resource.name,
-    'oldValue'
-  );
-  const oldReadTime = dateToTimestampProto(
-    _.get(event, 'data.oldValue.readTime')
-  );
-  return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json');
+  const oldValueProto = _getValueProto(event.data, event.context.resource.name, "oldValue");
+  const oldReadTime = dateToTimestampProto(event?.data?.oldValue?.readTime);
+  return firestoreInstance.snapshot_(oldValueProto, oldReadTime, "json");
 }
 
 function changeConstructor(raw: Event) {
-  return Change.fromObjects(
-    beforeSnapshotConstructor(raw),
-    snapshotConstructor(raw)
-  );
+  return Change.fromObjects(beforeSnapshotConstructor(raw), snapshotConstructor(raw));
 }
 
-export class DocumentBuilder {
-  /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {
+export class DocumentBuilder<Path extends string> {
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {
     // TODO what validation do we want to do here?
   }
 
@@ -207,56 +177,52 @@ export class DocumentBuilder {
   onWrite(
     handler: (
       change: Change<DocumentSnapshot>,
-      context: EventContext
+      context: EventContext<ParamsOf<Path>>
     ) => PromiseLike<any> | any
   ): CloudFunction<Change<DocumentSnapshot>> {
-    return this.onOperation(handler, 'document.write', changeConstructor);
+    return this.onOperation(handler, "document.write", changeConstructor);
   }
 
   /** Respond only to document updates. */
   onUpdate(
     handler: (
       change: Change<QueryDocumentSnapshot>,
-      context: EventContext
+      context: EventContext<ParamsOf<Path>>
     ) => PromiseLike<any> | any
   ): CloudFunction<Change<QueryDocumentSnapshot>> {
-    return this.onOperation(handler, 'document.update', changeConstructor);
+    return this.onOperation(handler, "document.update", changeConstructor);
   }
 
   /** Respond only to document creations. */
   onCreate(
     handler: (
       snapshot: QueryDocumentSnapshot,
-      context: EventContext
+      context: EventContext<ParamsOf<Path>>
     ) => PromiseLike<any> | any
   ): CloudFunction<QueryDocumentSnapshot> {
-    return this.onOperation(handler, 'document.create', snapshotConstructor);
+    return this.onOperation(handler, "document.create", snapshotConstructor);
   }
 
   /** Respond only to document deletions. */
   onDelete(
     handler: (
       snapshot: QueryDocumentSnapshot,
-      context: EventContext
+      context: EventContext<ParamsOf<Path>>
     ) => PromiseLike<any> | any
   ): CloudFunction<QueryDocumentSnapshot> {
-    return this.onOperation(
-      handler,
-      'document.delete',
-      beforeSnapshotConstructor
-    );
+    return this.onOperation(handler, "document.delete", beforeSnapshotConstructor);
   }
 
   private onOperation<T>(
-    handler: (data: T, context: EventContext) => PromiseLike<any> | any,
+    handler: (data: T, context: EventContext<ParamsOf<Path>>) => PromiseLike<any> | any,
     eventType: string,
     dataConstructor: (raw: Event) => any
   ): CloudFunction<T> {
     return makeCloudFunction({
       handler,
-      provider,
+      provider: provider,
       eventType,
-      service,
+      service: service,
       triggerResource: this.triggerResource,
       legacyEventType: `providers/cloud.firestore/eventTypes/${eventType}`,
       dataConstructor,
diff --git a/src/providers/https.ts b/src/v1/providers/https.ts
similarity index 74%
rename from src/providers/https.ts
rename to src/v1/providers/https.ts
index 842ebd84c..d9d1a9b29 100644
--- a/src/providers/https.ts
+++ b/src/v1/providers/https.ts
@@ -20,23 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
+import * as express from "express";
 
-import {
-  HttpsFunction,
-  optionsToEndpoint,
-  optionsToTrigger,
-  Runnable,
-} from '../cloud-functions';
-import { convertIfPresent, convertInvoker } from '../common/encoding';
+import { convertIfPresent, convertInvoker } from "../../common/encoding";
 import {
   CallableContext,
   FunctionsErrorCode,
   HttpsError,
   onCallHandler,
   Request,
-} from '../common/providers/https';
-import { DeploymentOptions } from '../function-configuration';
+} from "../../common/providers/https";
+import { HttpsFunction, optionsToEndpoint, Runnable } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
+import { initV1Endpoint } from "../../runtime/manifest";
 
 export { Request, CallableContext, FunctionsErrorCode, HttpsError };
 
@@ -61,44 +57,34 @@ export function onCall(
   return _onCallWithOptions(handler, {});
 }
 
-/** @hidden */
+/** @internal */
 export function _onRequestWithOptions(
   handler: (req: Request, resp: express.Response) => void | Promise<void>,
   options: DeploymentOptions
 ): HttpsFunction {
-  // lets us add __trigger without altering handler:
+  // lets us add __endpoint without altering handler:
   const cloudFunction: any = (req: Request, res: express.Response) => {
     return handler(req, res);
   };
-  cloudFunction.__trigger = {
-    ...optionsToTrigger(options),
-    httpsTrigger: {},
-  };
-  convertIfPresent(
-    cloudFunction.__trigger.httpsTrigger,
-    options,
-    'invoker',
-    'invoker',
-    convertInvoker
-  );
   // TODO parse the options
 
   cloudFunction.__endpoint = {
-    platform: 'gcfv1',
+    platform: "gcfv1",
+    ...initV1Endpoint(options),
     ...optionsToEndpoint(options),
     httpsTrigger: {},
   };
   convertIfPresent(
     cloudFunction.__endpoint.httpsTrigger,
     options,
-    'invoker',
-    'invoker',
+    "invoker",
+    "invoker",
     convertInvoker
   );
   return cloudFunction;
 }
 
-/** @hidden */
+/** @internal */
 export function _onCallWithOptions(
   handler: (data: any, context: CallableContext) => any | Promise<any>,
   options: DeploymentOptions
@@ -106,26 +92,19 @@ export function _onCallWithOptions(
   // onCallHandler sniffs the function length of the passed-in callback
   // and the user could have only tried to listen to data. Wrap their handler
   // in another handler to avoid accidentally triggering the v2 API
-  const fixedLen = (data: any, context: CallableContext) =>
-    handler(data, context);
+  const fixedLen = (data: any, context: CallableContext) => handler(data, context);
   const func: any = onCallHandler(
     {
-      allowInvalidAppCheckToken: options.allowInvalidAppCheckToken,
-      cors: { origin: true, methods: 'POST' },
+      enforceAppCheck: options.enforceAppCheck,
+      cors: { origin: true, methods: "POST" },
     },
     fixedLen
   );
 
-  func.__trigger = {
-    labels: {},
-    ...optionsToTrigger(options),
-    httpsTrigger: {},
-  };
-  func.__trigger.labels['deployment-callable'] = 'true';
-
   func.__endpoint = {
-    platform: 'gcfv1',
+    platform: "gcfv1",
     labels: {},
+    ...initV1Endpoint(options),
     ...optionsToEndpoint(options),
     callableTrigger: {},
   };
diff --git a/src/providers/pubsub.ts b/src/v1/providers/pubsub.ts
similarity index 75%
rename from src/providers/pubsub.ts
rename to src/v1/providers/pubsub.ts
index 18517bee0..57a28803c 100644
--- a/src/providers/pubsub.ts
+++ b/src/v1/providers/pubsub.ts
@@ -20,20 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import {
-  CloudFunction,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import {
-  DeploymentOptions,
-  ScheduleRetryConfig,
-} from '../function-configuration';
-
-/** @hidden */
-export const provider = 'google.pubsub';
-/** @hidden */
-export const service = 'pubsub.googleapis.com';
+import { CloudFunction, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions, ScheduleRetryConfig } from "../function-configuration";
+
+/** @internal */
+export const provider = "google.pubsub";
+/** @internal */
+export const service = "pubsub.googleapis.com";
 
 /**
  * Registers a Cloud Function triggered when a Google Cloud Pub/Sub message
@@ -46,18 +39,15 @@ export function topic(topic: string) {
   return _topicWithOptions(topic, {});
 }
 
-/** @hidden */
-export function _topicWithOptions(
-  topic: string,
-  options: DeploymentOptions
-): TopicBuilder {
-  if (topic.indexOf('/') !== -1) {
-    throw new Error('Topic name may not have a /');
+/** @internal */
+export function _topicWithOptions(topic: string, options: DeploymentOptions): TopicBuilder {
+  if (topic.indexOf("/") !== -1) {
+    throw new Error("Topic name may not have a /");
   }
 
   return new TopicBuilder(() => {
     if (!process.env.GCLOUD_PROJECT) {
-      throw new Error('process.env.GCLOUD_PROJECT is not set.');
+      throw new Error("process.env.GCLOUD_PROJECT is not set.");
     }
     return `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`;
   }, options);
@@ -66,14 +56,11 @@ export function _topicWithOptions(
 /**
  * The Google Cloud Pub/Sub topic builder.
  *
- * Access via [`functions.pubsub.topic()`](providers_pubsub_.html#topic).
+ * Access via `functions.pubsub.topic()`.
  */
 export class TopicBuilder {
   /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Event handler that fires every time a Cloud Pub/Sub message is
@@ -81,7 +68,7 @@ export class TopicBuilder {
    *
    * @param handler - Event handler that runs every time a Cloud Pub/Sub message
    *   is published.
-   * @return A Cloud Function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onPublish(
     handler: (message: Message, context: EventContext) => PromiseLike<any> | any
@@ -91,7 +78,7 @@ export class TopicBuilder {
       provider,
       service,
       triggerResource: this.triggerResource,
-      eventType: 'topic.publish',
+      eventType: "topic.publish",
       dataConstructor: (raw) => new Message(raw.data),
       options: this.options,
     });
@@ -102,20 +89,20 @@ export class TopicBuilder {
  * Registers a Cloud Function to run at specified times.
  *
  * @param schedule - The schedule, in Unix Crontab or AppEngine syntax.
- * @return ScheduleBuilder interface.
+ * @returns ScheduleBuilder interface.
  */
 export function schedule(schedule: string): ScheduleBuilder {
   return _scheduleWithOptions(schedule, {});
 }
 
-/** @hidden */
+/** @internal */
 export function _scheduleWithOptions(
   schedule: string,
   options: DeploymentOptions
 ): ScheduleBuilder {
   const triggerResource = () => {
     if (!process.env.GCLOUD_PROJECT) {
-      throw new Error('process.env.GCLOUD_PROJECT is not set.');
+      throw new Error("process.env.GCLOUD_PROJECT is not set.");
     }
     // The CLI will append the correct topic name based on region and function name
     return `projects/${process.env.GCLOUD_PROJECT}/topics`;
@@ -133,14 +120,11 @@ export function _scheduleWithOptions(
  * frequency. For more information, see
  * [Schedule functions](/docs/functions/schedule-functions).
  *
- * Access via [`functions.pubsub.schedule()`](providers_pubsub_.html#schedule).
+ * Access via `functions.pubsub.schedule()`.
  */
 export class ScheduleBuilder {
   /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   retryConfig(config: ScheduleRetryConfig): ScheduleBuilder {
     this.options.schedule.retryConfig = config;
@@ -158,7 +142,7 @@ export class ScheduleBuilder {
    *
    * @param handler - Handler that fires whenever the associated
    *   scheduler job sends a Pub/Sub message.
-   * @return A Cloud Function that you can export and deploy.
+   * @returns A function that you can export and deploy.
    */
   onRun(handler: (context: EventContext) => PromiseLike<any> | any) {
     const cloudFunction = makeCloudFunction({
@@ -166,9 +150,9 @@ export class ScheduleBuilder {
       provider,
       service,
       triggerResource: this.triggerResource,
-      eventType: 'topic.publish',
+      eventType: "topic.publish",
       options: this.options,
-      labels: { 'deployment-scheduled': 'true' },
+      labels: { "deployment-scheduled": "true" },
     });
     return cloudFunction;
   }
@@ -194,21 +178,15 @@ export class Message {
   private _json: any;
 
   constructor(data: any) {
-    [this.data, this.attributes, this._json] = [
-      data.data,
-      data.attributes || {},
-      data.json,
-    ];
+    [this.data, this.attributes, this._json] = [data.data, data.attributes || {}, data.json];
   }
 
   /**
    * The JSON data payload of this message object, if any.
    */
   get json(): any {
-    if (typeof this._json === 'undefined') {
-      this._json = JSON.parse(
-        Buffer.from(this.data, 'base64').toString('utf8')
-      );
+    if (typeof this._json === "undefined") {
+      this._json = JSON.parse(Buffer.from(this.data, "base64").toString("utf8"));
     }
 
     return this._json;
@@ -217,7 +195,7 @@ export class Message {
   /**
    * Returns a JSON-serializable representation of this object.
    *
-   * @return A JSON-serializable representation of this object.
+   * @returns A JSON-serializable representation of this object.
    */
   toJSON(): any {
     return {
diff --git a/src/providers/remoteConfig.ts b/src/v1/providers/remoteConfig.ts
similarity index 81%
rename from src/providers/remoteConfig.ts
rename to src/v1/providers/remoteConfig.ts
index f15716c17..cf67383dc 100644
--- a/src/providers/remoteConfig.ts
+++ b/src/v1/providers/remoteConfig.ts
@@ -20,19 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as _ from 'lodash';
+import { CloudFunction, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
 
-import {
-  CloudFunction,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { DeploymentOptions } from '../function-configuration';
-
-/** @hidden */
-export const provider = 'google.firebase.remoteconfig';
-/** @hidden */
-export const service = 'firebaseremoteconfig.googleapis.com';
+/** @internal */
+export const provider = "google.firebase.remoteconfig";
+/** @internal */
+export const service = "firebaseremoteconfig.googleapis.com";
 
 /**
  * Registers a function that triggers on Firebase Remote Config template
@@ -41,28 +35,22 @@ export const service = 'firebaseremoteconfig.googleapis.com';
  * @param handler A function that takes the updated Remote Config
  *   template version metadata as an argument.
  *
- * @return A Cloud Function that you can export and deploy.
+ * @returns A function that you can export and deploy.
  */
 export function onUpdate(
-  handler: (
-    version: TemplateVersion,
-    context: EventContext
-  ) => PromiseLike<any> | any
+  handler: (version: TemplateVersion, context: EventContext) => PromiseLike<any> | any
 ): CloudFunction<TemplateVersion> {
   return _onUpdateWithOptions(handler, {});
 }
 
-/** @hidden */
+/** @internal */
 export function _onUpdateWithOptions(
-  handler: (
-    version: TemplateVersion,
-    context: EventContext
-  ) => PromiseLike<any> | any,
+  handler: (version: TemplateVersion, context: EventContext) => PromiseLike<any> | any,
   options: DeploymentOptions
 ): CloudFunction<TemplateVersion> {
   const triggerResource = () => {
     if (!process.env.GCLOUD_PROJECT) {
-      throw new Error('process.env.GCLOUD_PROJECT is not set.');
+      throw new Error("process.env.GCLOUD_PROJECT is not set.");
     }
     return `projects/${process.env.GCLOUD_PROJECT}`;
   };
@@ -71,11 +59,8 @@ export function _onUpdateWithOptions(
 
 /** Builder used to create Cloud Functions for Remote Config. */
 export class UpdateBuilder {
-  /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  /** @internal */
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Handle all updates (including rollbacks) that affect a Remote Config
@@ -84,17 +69,14 @@ export class UpdateBuilder {
    * version metadata as an argument.
    */
   onUpdate(
-    handler: (
-      version: TemplateVersion,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (version: TemplateVersion, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<TemplateVersion> {
     return makeCloudFunction({
       handler,
       provider,
       service,
       triggerResource: this.triggerResource,
-      eventType: 'update',
+      eventType: "update",
       options: this.options,
     });
   }
diff --git a/src/providers/storage.ts b/src/v1/providers/storage.ts
similarity index 77%
rename from src/providers/storage.ts
rename to src/v1/providers/storage.ts
index 33b2a64eb..998760eb6 100644
--- a/src/providers/storage.ts
+++ b/src/v1/providers/storage.ts
@@ -20,18 +20,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import {
-  CloudFunction,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { firebaseConfig } from '../config';
-import { DeploymentOptions } from '../function-configuration';
-
-/** @hidden */
-export const provider = 'google.storage';
-/** @hidden */
-export const service = 'storage.googleapis.com';
+import { firebaseConfig } from "../../common/config";
+import { CloudFunction, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
+
+/** @internal */
+export const provider = "google.storage";
+/** @internal */
+export const service = "storage.googleapis.com";
 
 /**
  * Registers a Cloud Function scoped to a specific storage bucket.
@@ -39,7 +35,7 @@ export const service = 'storage.googleapis.com';
  * @param bucket Name of the bucket to which this Cloud Function is
  *   scoped.
  *
- * @return Storage bucket builder interface.
+ * @returns Storage bucket builder interface.
  */
 export function bucket(bucket?: string) {
   return _bucketWithOptions({}, bucket);
@@ -49,23 +45,20 @@ export function bucket(bucket?: string) {
  * Registers a Cloud Function scoped to the default storage bucket for the
  * project.
  *
- * @return Storage object builder interface.
+ * @returns Storage object builder interface.
  */
 export function object() {
   return _objectWithOptions({});
 }
 
-/** @hidden */
-export function _bucketWithOptions(
-  options: DeploymentOptions,
-  bucket?: string
-): BucketBuilder {
+/** @internal */
+export function _bucketWithOptions(options: DeploymentOptions, bucket?: string): BucketBuilder {
   const resourceGetter = () => {
     bucket = bucket || firebaseConfig().storageBucket;
     if (!bucket) {
       throw new Error(
-        'Missing bucket name. If you are unit testing, please provide a bucket name' +
-          ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.'
+        "Missing bucket name. If you are unit testing, please provide a bucket name" +
+          " through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG."
       );
     }
     if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) {
@@ -76,7 +69,7 @@ export function _bucketWithOptions(
   return new BucketBuilder(resourceGetter, options);
 }
 
-/** @hidden */
+/** @internal */
 export function _objectWithOptions(options: DeploymentOptions): ObjectBuilder {
   return _bucketWithOptions(options).object();
 }
@@ -84,19 +77,16 @@ export function _objectWithOptions(options: DeploymentOptions): ObjectBuilder {
 /**
  * The Google Cloud Storage bucket builder interface.
  *
- * Access via [`functions.storage.bucket()`](providers_storage_.html#bucket).
+ * Access via `functions.storage.bucket()`.
  */
 export class BucketBuilder {
-  /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  /** @internal */
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Event handler which fires every time a Google Cloud Storage change occurs.
    *
-   * @return Storage object builder interface scoped to the specified storage
+   * @returns Storage object builder interface scoped to the specified storage
    *   bucket.
    */
   object() {
@@ -107,22 +97,11 @@ export class BucketBuilder {
 /**
  * The Google Cloud Storage object builder interface.
  *
- * Access via [`functions.storage.object()`](providers_storage_.html#object).
+ * Access via `functions.storage.object()`.
  */
 export class ObjectBuilder {
-  /** @hidden */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
-
-  /** @hidden */
-  onChange(handler: any): Error {
-    throw new Error(
-      '"onChange" is now deprecated, please use "onArchive", "onDelete", ' +
-        '"onFinalize", or "onMetadataUpdate".'
-    );
-  }
+  /** @internal */
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /**
    * Event handler sent only when a bucket has enabled object versioning.
@@ -133,15 +112,12 @@ export class ObjectBuilder {
    * @param handler Event handler which is run every time a Google Cloud Storage
    *   archival occurs.
    *
-   * @return A Cloud Function which you can export and deploy.
+   * @returns A function which you can export and deploy.
    */
   onArchive(
-    handler: (
-      object: ObjectMetadata,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (object: ObjectMetadata, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<ObjectMetadata> {
-    return this.onOperation(handler, 'object.archive');
+    return this.onOperation(handler, "object.archive");
   }
 
   /**
@@ -156,15 +132,12 @@ export class ObjectBuilder {
    * @param handler Event handler which is run every time a Google Cloud Storage
    *   deletion occurs.
    *
-   * @return A Cloud Function which you can export and deploy.
+   * @returns A function which you can export and deploy.
    */
   onDelete(
-    handler: (
-      object: ObjectMetadata,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (object: ObjectMetadata, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<ObjectMetadata> {
-    return this.onOperation(handler, 'object.delete');
+    return this.onOperation(handler, "object.delete");
   }
 
   /**
@@ -178,15 +151,12 @@ export class ObjectBuilder {
    * @param handler Event handler which is run every time a Google Cloud Storage
    *   object creation occurs.
    *
-   * @return A Cloud Function which you can export and deploy.
+   * @returns A function which you can export and deploy.
    */
   onFinalize(
-    handler: (
-      object: ObjectMetadata,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (object: ObjectMetadata, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<ObjectMetadata> {
-    return this.onOperation(handler, 'object.finalize');
+    return this.onOperation(handler, "object.finalize");
   }
 
   /**
@@ -196,23 +166,17 @@ export class ObjectBuilder {
    * @param handler Event handler which is run every time a Google Cloud Storage
    *   metadata update occurs.
    *
-   * @return A Cloud Function which you can export and deploy.
+   * @returns A function which you can export and deploy.
    */
   onMetadataUpdate(
-    handler: (
-      object: ObjectMetadata,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (object: ObjectMetadata, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<ObjectMetadata> {
-    return this.onOperation(handler, 'object.metadataUpdate');
+    return this.onOperation(handler, "object.metadataUpdate");
   }
 
   /** @hidden */
   private onOperation(
-    handler: (
-      object: ObjectMetadata,
-      context: EventContext
-    ) => PromiseLike<any> | any,
+    handler: (object: ObjectMetadata, context: EventContext) => PromiseLike<any> | any,
     eventType: string
   ): CloudFunction<ObjectMetadata> {
     return makeCloudFunction({
@@ -260,7 +224,7 @@ export interface ObjectMetadata {
   /** Link to access the object, assuming you have sufficient permissions. */
   selfLink?: string;
 
-  /**The object's name. */
+  /** The object's name. */
   name?: string;
 
   /**
diff --git a/src/providers/tasks.ts b/src/v1/providers/tasks.ts
similarity index 75%
rename from src/providers/tasks.ts
rename to src/v1/providers/tasks.ts
index f06e7b92e..20a516e68 100644
--- a/src/providers/tasks.ts
+++ b/src/v1/providers/tasks.ts
@@ -20,23 +20,24 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
+import * as express from "express";
 
-import { optionsToEndpoint, optionsToTrigger } from '../cloud-functions';
-import {
-  convertIfPresent,
-  convertInvoker,
-  copyIfPresent,
-} from '../common/encoding';
-import { Request } from '../common/providers/https';
+import { convertIfPresent, convertInvoker, copyIfPresent } from "../../common/encoding";
+import { Request } from "../../common/providers/https";
 import {
   onDispatchHandler,
   RateLimits,
   RetryConfig,
   TaskContext,
-} from '../common/providers/tasks';
-import { DeploymentOptions } from '../function-configuration';
-import { ManifestEndpoint, ManifestRequiredAPI } from '../runtime/manifest';
+} from "../../common/providers/tasks";
+import {
+  initV1Endpoint,
+  initTaskQueueTrigger,
+  ManifestEndpoint,
+  ManifestRequiredAPI,
+} from "../../runtime/manifest";
+import { optionsToEndpoint } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
 
 export { RetryConfig, RateLimits, TaskContext };
 
@@ -55,7 +56,7 @@ export interface TaskQueueOptions {
    * `roles/cloudtasks.enqueuer` and `roles/cloudfunctions.invoker`
    * will have permissions.
    */
-  invoker?: 'private' | string | string[];
+  invoker?: "private" | string | string[];
 }
 
 /**
@@ -64,9 +65,6 @@ export interface TaskQueueOptions {
 export interface TaskQueueFunction {
   (req: Request, res: express.Response): Promise<void>;
 
-  /** @alpha */
-  __trigger: unknown;
-
   /** @alpha */
   __endpoint: ManifestEndpoint;
 
@@ -97,7 +95,7 @@ export class TaskQueueBuilder {
   /**
    * Creates a handler for tasks sent to a Google Cloud Tasks queue.
    * @param handler - A callback to handle task requests.
-   * @returns A Cloud Function you can export and deploy.
+   * @returns A function you can export and deploy.
    */
   onDispatch(
     handler: (data: any, context: TaskContext) => void | Promise<void>
@@ -105,43 +103,29 @@ export class TaskQueueBuilder {
     // onEnqueueHandler sniffs the function length of the passed-in callback
     // and the user could have only tried to listen to data. Wrap their handler
     // in another handler to avoid accidentally triggering the v2 API
-    const fixedLen = (data: any, context: TaskContext) =>
-      handler(data, context);
+    const fixedLen = (data: any, context: TaskContext) => handler(data, context);
     const func: any = onDispatchHandler(fixedLen);
 
-    func.__trigger = {
-      ...optionsToTrigger(this.depOpts || {}),
-      taskQueueTrigger: {},
-    };
-    copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'retryConfig');
-    copyIfPresent(func.__trigger.taskQueueTrigger, this.tqOpts, 'rateLimits');
-    convertIfPresent(
-      func.__trigger.taskQueueTrigger,
-      this.tqOpts,
-      'invoker',
-      'invoker',
-      convertInvoker
-    );
-
     func.__endpoint = {
-      platform: 'gcfv1',
+      platform: "gcfv1",
+      ...initV1Endpoint(this.depOpts),
       ...optionsToEndpoint(this.depOpts),
-      taskQueueTrigger: {},
+      taskQueueTrigger: initTaskQueueTrigger(this.depOpts),
     };
-    copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'retryConfig');
-    copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, 'rateLimits');
+    copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, "retryConfig");
+    copyIfPresent(func.__endpoint.taskQueueTrigger, this.tqOpts, "rateLimits");
     convertIfPresent(
       func.__endpoint.taskQueueTrigger,
       this.tqOpts,
-      'invoker',
-      'invoker',
+      "invoker",
+      "invoker",
       convertInvoker
     );
 
     func.__requiredAPIs = [
       {
-        api: 'cloudtasks.googleapis.com',
-        reason: 'Needed for task queue functions',
+        api: "cloudtasks.googleapis.com",
+        reason: "Needed for task queue functions",
       },
     ];
 
diff --git a/src/providers/testLab.ts b/src/v1/providers/testLab.ts
similarity index 55%
rename from src/providers/testLab.ts
rename to src/v1/providers/testLab.ts
index 86398c5c9..d0d0cd06a 100644
--- a/src/providers/testLab.ts
+++ b/src/v1/providers/testLab.ts
@@ -20,22 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as _ from 'lodash';
-
-import {
-  CloudFunction,
-  Event,
-  EventContext,
-  makeCloudFunction,
-} from '../cloud-functions';
-import { DeploymentOptions } from '../function-configuration';
+import { CloudFunction, Event, EventContext, makeCloudFunction } from "../cloud-functions";
+import { DeploymentOptions } from "../function-configuration";
 
 /** @internal */
-export const PROVIDER = 'google.testing';
+export const PROVIDER = "google.testing";
 /** @internal */
-export const SERVICE = 'testing.googleapis.com';
+export const SERVICE = "testing.googleapis.com";
 /** @internal */
-export const TEST_MATRIX_COMPLETE_EVENT_TYPE = 'testMatrix.complete';
+export const TEST_MATRIX_COMPLETE_EVENT_TYPE = "testMatrix.complete";
 
 /** Handle events related to Test Lab test matrices. */
 export function testMatrix() {
@@ -46,26 +39,20 @@ export function testMatrix() {
 export function _testMatrixWithOpts(opts: DeploymentOptions) {
   return new TestMatrixBuilder(() => {
     if (!process.env.GCLOUD_PROJECT) {
-      throw new Error('process.env.GCLOUD_PROJECT is not set.');
+      throw new Error("process.env.GCLOUD_PROJECT is not set.");
     }
-    return 'projects/' + process.env.GCLOUD_PROJECT + '/testMatrices/{matrix}';
+    return "projects/" + process.env.GCLOUD_PROJECT + "/testMatrices/{matrix}";
   }, opts);
 }
 
 /** Builder used to create Cloud Functions for Test Lab test matrices events. */
 export class TestMatrixBuilder {
   /** @internal */
-  constructor(
-    private triggerResource: () => string,
-    private options: DeploymentOptions
-  ) {}
+  constructor(private triggerResource: () => string, private options: DeploymentOptions) {}
 
   /** Handle a TestMatrix that reached a final test state. */
   onComplete(
-    handler: (
-      testMatrix: TestMatrix,
-      context: EventContext
-    ) => PromiseLike<any> | any
+    handler: (testMatrix: TestMatrix, context: EventContext) => PromiseLike<any> | any
   ): CloudFunction<TestMatrix> {
     const dataConstructor = (raw: Event) => {
       return new TestMatrix(raw.data);
@@ -129,12 +116,12 @@ export class ClientInfo {
   details: { [key: string]: string };
 
   /** @internal */
-  constructor(data?: any) {
-    this.name = _.get(data, 'name', '');
+  constructor(data?: { name: string; clientInfoDetails?: Array<{ key: string; value?: string }> }) {
+    this.name = data?.name || "";
     this.details = {};
-    _.forEach(_.get(data, 'clientInfoDetails'), (detail: any) => {
-      this.details[detail.key] = detail.value || '';
-    });
+    for (const detail of data?.clientInfoDetails || []) {
+      this.details[detail.key] = detail.value || "";
+    }
   }
 }
 
@@ -157,141 +144,173 @@ export class ResultStorage {
 
   /** @internal */
   constructor(data?: any) {
-    this.gcsPath = _.get(data, 'googleCloudStorage.gcsPath');
-    this.toolResultsHistoryId = _.get(data, 'toolResultsHistory.historyId');
-    this.toolResultsExecutionId = _.get(
-      data,
-      'toolResultsExecution.executionId'
-    );
-    this.resultsUrl = _.get(data, 'resultsUrl');
+    this.gcsPath = data?.googleCloudStorage?.gcsPath;
+    this.toolResultsHistoryId = data?.toolResultsHistory?.historyId;
+    this.toolResultsExecutionId = data?.toolResultsExecution?.executionId;
+    this.resultsUrl = data?.resultsUrl;
   }
 }
 
 /**
  * The detailed reason that a Matrix was deemed INVALID.
  *
+ * @remarks
  * Possible values:
- * - 'DETAILS_UNAVAILABLE': The matrix is INVALID, but there are no further
- *   details available.
- * - 'MALFORMED_APK': The input app APK could not be parsed.
- * - 'MALFORMED_TEST_APK': The input test APK could not be parsed.
- * - 'NO_MANIFEST': The AndroidManifest.xml could not be found.
- * - 'NO_PACKAGE_NAME': The APK manifest does not declare a package name.
- * - 'INVALID_PACKAGE_NAME': The APK application ID is invalid.
- * - 'TEST_SAME_AS_APP': The test package and app package are the same.
- * - 'NO_INSTRUMENTATION': The test apk does not declare an instrumentation.
- * - 'NO_SIGNATURE': The input app apk does not have a signature.
- * - 'INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE': The test runner class
- *   specified by user or in the test APK's manifest file is not compatible with
- *   Android Test Orchestrator.
- * - 'NO_TEST_RUNNER_CLASS': The test APK does not contain the test runner class
+ *
+ * - `DETAILS_UNAVAILABLE`: The matrix is INVALID, but there are no further details available.
+ *
+ * - `MALFORMED_APK`: The input app APK could not be parsed.
+ *
+ * - `MALFORMED_TEST_APK`: The input test APK could not be parsed.
+ *
+ * - `NO_MANIFEST`: The AndroidManifest.xml could not be found.
+ *
+ * - `NO_PACKAGE_NAME`: The APK manifest does not declare a package name.
+ *
+ * - `INVALID_PACKAGE_NAME`: The APK application ID is invalid.
+ *
+ * - `TEST_SAME_AS_APP`: The test package and app package are the same.
+ *
+ * - `NO_INSTRUMENTATION`: The test apk does not declare an instrumentation.
+ *
+ * - `NO_SIGNATURE`: The input app apk does not have a signature.
+ *
+ * - `INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE`: The test runner class specified by
+ * user or in the test APK`s manifest file is not compatible with Android Test Orchestrator.
+ *
+ * - `NO_TEST_RUNNER_CLASS`: The test APK does not contain the test runner class
  *   specified by user or in the manifest file.
- * - 'NO_LAUNCHER_ACTIVITY': A main launcher activity could not be found.
- * - 'FORBIDDEN_PERMISSIONS': The app declares one or more permissions that are
+ *
+ * - `NO_LAUNCHER_ACTIVITY`: A main launcher activity could not be found.
+ *
+ * - `FORBIDDEN_PERMISSIONS`: The app declares one or more permissions that are
  *   not allowed.
- * - 'INVALID_ROBO_DIRECTIVES': There is a conflict in the provided
+ *
+ * - `INVALID_ROBO_DIRECTIVES`: There is a conflict in the provided
  *   robo_directives.
- * - 'INVALID_RESOURCE_NAME': There is at least one invalid resource name in the
+ *
+ * - `INVALID_RESOURCE_NAME`: There is at least one invalid resource name in the
  *   provided robo directives.
- * - 'INVALID_DIRECTIVE_ACTION': Invalid definition of action in the robo
+ *
+ * - `INVALID_DIRECTIVE_ACTION`: Invalid definition of action in the robo
  *   directives, e.g. a click or ignore action includes an input text field.
- * - 'TEST_LOOP_INTENT_FILTER_NOT_FOUND': There is no test loop intent filter,
+ *
+ * - `TEST_LOOP_INTENT_FILTER_NOT_FOUND`: There is no test loop intent filter,
  *   or the one that is given is not formatted correctly.
- * - 'SCENARIO_LABEL_NOT_DECLARED': The request contains a scenario label that
+ *
+ * - `SCENARIO_LABEL_NOT_DECLARED`: The request contains a scenario label that
  *   was not declared in the manifest.
- * - 'SCENARIO_LABEL_MALFORMED': There was an error when parsing a label value.
- * - 'SCENARIO_NOT_DECLARED': The request contains a scenario number that was
+ *
+ * - `SCENARIO_LABEL_MALFORMED`: There was an error when parsing a label value.
+ *
+ * - `SCENARIO_NOT_DECLARED`: The request contains a scenario number that was
  *   not declared in the manifest.
- * - 'DEVICE_ADMIN_RECEIVER': Device administrator applications are not allowed.
- * - 'MALFORMED_XC_TEST_ZIP': The zipped XCTest was malformed. The zip did not ]
+ *
+ * - `DEVICE_ADMIN_RECEIVER`: Device administrator applications are not allowed.
+ *
+ * - `MALFORMED_XC_TEST_ZIP`: The zipped XCTest was malformed. The zip did not ]
  *   contain a single .xctestrun file and the contents of the
  *   DerivedData/Build/Products directory.
- * - 'BUILT_FOR_IOS_SIMULATOR': The zipped XCTest was built for the iOS
+ *
+ * - `BUILT_FOR_IOS_SIMULATOR`: The zipped XCTest was built for the iOS
  *   simulator rather than for a physical device.
- * - 'NO_TESTS_IN_XC_TEST_ZIP': The .xctestrun file did not specify any test
+ *
+ * - `NO_TESTS_IN_XC_TEST_ZIP`: The .xctestrun file did not specify any test
  *   targets.
- * - 'USE_DESTINATION_ARTIFACTS': One or more of the test targets defined in the
+ *
+ * - `USE_DESTINATION_ARTIFACTS`: One or more of the test targets defined in the
  *   .xctestrun file specifies "UseDestinationArtifacts", which is disallowed.
- * - 'TEST_NON_APP_HOSTED': XC tests which run on physical devices must have
+ *
+ * - `TEST_NON_APP_HOSTED`: XC tests which run on physical devices must have
  *   "IsAppHostedTestBundle" == "true" in the xctestrun file.
- * - 'PLIST_CANNOT_BE_PARSED': An Info.plist file in the XCTest zip could not be
+ *
+ * - `PLIST_CANNOT_BE_PARSED`: An Info.plist file in the XCTest zip could not be
  *   parsed.
- * - 'NO_CODE_APK': APK contains no code.
- * - 'INVALID_INPUT_APK': Either the provided input APK path was malformed, the
+ *
+ * - `NO_CODE_APK`: APK contains no code.
+ *
+ * - `INVALID_INPUT_APK`: Either the provided input APK path was malformed, the
  *   APK file does not exist, or the user does not have permission to access the
  *   APK file.
- * - 'INVALID_APK_PREVIEW_SDK': APK is built for a preview SDK which is
+ *
+ * - `INVALID_APK_PREVIEW_SDK`: APK is built for a preview SDK which is
  *   unsupported.
  */
 export type InvalidMatrixDetails =
-  | 'DETAILS_UNAVAILABLE'
-  | 'MALFORMED_APK'
-  | 'MALFORMED_TEST_APK'
-  | 'NO_MANIFEST'
-  | 'NO_PACKAGE_NAME'
-  | 'INVALID_PACKAGE_NAME'
-  | 'TEST_SAME_AS_APP'
-  | 'NO_INSTRUMENTATION'
-  | 'NO_SIGNATURE'
-  | 'INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE'
-  | 'NO_TEST_RUNNER_CLASS'
-  | 'NO_LAUNCHER_ACTIVITY'
-  | 'FORBIDDEN_PERMISSIONS'
-  | 'INVALID_ROBO_DIRECTIVES'
-  | 'INVALID_RESOURCE_NAME'
-  | 'INVALID_DIRECTIVE_ACTION'
-  | 'TEST_LOOP_INTENT_FILTER_NOT_FOUND'
-  | 'SCENARIO_LABEL_NOT_DECLARED'
-  | 'SCENARIO_LABEL_MALFORMED'
-  | 'SCENARIO_NOT_DECLARED'
-  | 'DEVICE_ADMIN_RECEIVER'
-  | 'MALFORMED_XC_TEST_ZIP'
-  | 'BUILT_FOR_IOS_SIMULATOR'
-  | 'NO_TESTS_IN_XC_TEST_ZIP'
-  | 'USE_DESTINATION_ARTIFACTS'
-  | 'TEST_NOT_APP_HOSTED'
-  | 'PLIST_CANNOT_BE_PARSED'
-  | 'NO_CODE_APK'
-  | 'INVALID_INPUT_APK'
-  | 'INVALID_APK_PREVIEW_SDK';
+  | "DETAILS_UNAVAILABLE"
+  | "MALFORMED_APK"
+  | "MALFORMED_TEST_APK"
+  | "NO_MANIFEST"
+  | "NO_PACKAGE_NAME"
+  | "INVALID_PACKAGE_NAME"
+  | "TEST_SAME_AS_APP"
+  | "NO_INSTRUMENTATION"
+  | "NO_SIGNATURE"
+  | "INSTRUMENTATION_ORCHESTRATOR_INCOMPATIBLE"
+  | "NO_TEST_RUNNER_CLASS"
+  | "NO_LAUNCHER_ACTIVITY"
+  | "FORBIDDEN_PERMISSIONS"
+  | "INVALID_ROBO_DIRECTIVES"
+  | "INVALID_RESOURCE_NAME"
+  | "INVALID_DIRECTIVE_ACTION"
+  | "TEST_LOOP_INTENT_FILTER_NOT_FOUND"
+  | "SCENARIO_LABEL_NOT_DECLARED"
+  | "SCENARIO_LABEL_MALFORMED"
+  | "SCENARIO_NOT_DECLARED"
+  | "DEVICE_ADMIN_RECEIVER"
+  | "MALFORMED_XC_TEST_ZIP"
+  | "BUILT_FOR_IOS_SIMULATOR"
+  | "NO_TESTS_IN_XC_TEST_ZIP"
+  | "USE_DESTINATION_ARTIFACTS"
+  | "TEST_NOT_APP_HOSTED"
+  | "PLIST_CANNOT_BE_PARSED"
+  | "NO_CODE_APK"
+  | "INVALID_INPUT_APK"
+  | "INVALID_APK_PREVIEW_SDK";
 
 /**
  * The state (i.e. progress) of a TestMatrix.
  *
+ * @remarks
  * Possible values:
- * - 'VALIDATING': The matrix is being validated.
- * - 'PENDING': The matrix is waiting for resources to become available.
- * - 'FINISHED': The matrix has terminated normally. This means that the matrix
+ *
+ * - `VALIDATING`: The matrix is being validated.
+ *
+ * - `PENDING`: The matrix is waiting for resources to become available.
+ *
+ * - `FINISHED`: The matrix has terminated normally. This means that the matrix
  *   level processing completed normally, but individual executions may be in an
  *   ERROR state.
- * - 'ERROR': The matrix has stopped because it encountered an infrastructure
+ *
+ * - `ERROR`: The matrix has stopped because it encountered an infrastructure
  *   failure.
- * - 'INVALID': The matrix was not run because the provided inputs are not
+ *
+ * - `INVALID`: The matrix was not run because the provided inputs are not
  *   valid. E.g. the input file is not of the expected type, or is
  *   malformed/corrupt.
  */
-export type TestState =
-  | 'VALIDATING'
-  | 'PENDING'
-  | 'FINISHED'
-  | 'ERROR'
-  | 'INVALID';
+export type TestState = "VALIDATING" | "PENDING" | "FINISHED" | "ERROR" | "INVALID";
 
 /**
  * Outcome summary for a finished TestMatrix.
  *
+ * @remarks
  * Possible values:
- * - 'SUCCESS': The test matrix run was successful, for instance:
+ *
+ * - `SUCCESS`: The test matrix run was successful, for instance:
  *   - All the test cases passed.
  *   - Robo did not detect a crash of the application under test.
- * - 'FAILURE': The test run failed, for instance:
+ *
+ * - `FAILURE`: The test run failed, for instance:
  *   - One or more test cases failed.
  *   - A test timed out.
  *   - The application under test crashed.
- * - 'INCONCLUSIVE': Something unexpected happened. The run should still be
+ *
+ * - `INCONCLUSIVE`: Something unexpected happened. The run should still be
  *   considered unsuccessful but this is likely a transient problem and
  *   re-running the test might be successful.
- * - 'SKIPPED': All tests were skipped, for instance:
+ *
+ * - `SKIPPED`: All tests were skipped, for instance:
  *   - All device configurations were incompatible.
  */
-export type OutcomeSummary = 'SUCCESS' | 'FAILURE' | 'INCONCLUSIVE' | 'SKIPPED';
+export type OutcomeSummary = "SUCCESS" | "FAILURE" | "INCONCLUSIVE" | "SKIPPED";
diff --git a/src/v2/core.ts b/src/v2/core.ts
index 7bd88fc8d..7b79654e1 100644
--- a/src/v2/core.ts
+++ b/src/v2/core.ts
@@ -25,41 +25,12 @@
  * @packageDocumentation
  */
 
-import { Change } from '../common/change';
-import { ManifestEndpoint } from '../runtime/manifest';
+import { Change } from "../common/change";
+import { ManifestEndpoint } from "../runtime/manifest";
 
 export { Change };
 
-/** @internal */
-export interface TriggerAnnotation {
-  platform?: string;
-  concurrency?: number;
-  minInstances?: number;
-  maxInstances?: number;
-  availableMemoryMb?: number;
-  eventTrigger?: {
-    eventType: string;
-    resource: string;
-    service: string;
-  };
-  failurePolicy?: { retry: boolean };
-  httpsTrigger?: {
-    invoker?: string[];
-  };
-  labels?: { [key: string]: string };
-  regions?: string[];
-  timeout?: string;
-  vpcConnector?: string;
-  vpcConnectorEgressSettings?: string;
-  serviceAccountEmail?: string;
-  ingressSettings?: string;
-  secrets?: string[];
-  blockingTrigger?: {
-    eventType: string;
-    options?: Record<string, unknown>;
-  };
-  // TODO: schedule
-}
+export { ParamsOf } from "../common/params";
 
 /**
  * A CloudEventBase is the base of a cross-platform format for encoding a serverless event.
@@ -69,7 +40,7 @@ export interface TriggerAnnotation {
  */
 export interface CloudEvent<T> {
   /** Version of the CloudEvents spec for this event. */
-  readonly specversion: '1.0';
+  readonly specversion: "1.0";
 
   /** A globally unique ID for this event. */
   id: string;
@@ -99,8 +70,6 @@ export interface CloudEvent<T> {
 export interface CloudFunction<EventType extends CloudEvent<unknown>> {
   (raw: CloudEvent<unknown>): any | Promise<any>;
 
-  /** @alpha */
-  __trigger?: unknown;
   /** @alpha */
   __endpoint: ManifestEndpoint;
 
diff --git a/src/v2/index.ts b/src/v2/index.ts
index d1054504a..74e5b6d70 100644
--- a/src/v2/index.ts
+++ b/src/v2/index.ts
@@ -28,16 +28,18 @@
  * @packageDocumentation
  */
 
-import * as logger from '../logger';
-import * as alerts from './providers/alerts';
-import * as database from './providers/database';
-import * as eventarc from './providers/eventarc';
-import * as https from './providers/https';
-import * as identity from './providers/identity';
-import * as pubsub from './providers/pubsub';
-import * as scheduler from './providers/scheduler';
-import * as storage from './providers/storage';
-import * as tasks from './providers/tasks';
+import * as logger from "../logger";
+import * as alerts from "./providers/alerts";
+import * as database from "./providers/database";
+import * as eventarc from "./providers/eventarc";
+import * as https from "./providers/https";
+import * as identity from "./providers/identity";
+import * as pubsub from "./providers/pubsub";
+import * as scheduler from "./providers/scheduler";
+import * as storage from "./providers/storage";
+import * as tasks from "./providers/tasks";
+import * as remoteConfig from "./providers/remoteConfig";
+import * as testLab from "./providers/testLab";
 
 export {
   alerts,
@@ -50,6 +52,8 @@ export {
   tasks,
   eventarc,
   scheduler,
+  remoteConfig,
+  testLab,
 };
 
 export {
@@ -60,8 +64,7 @@ export {
   VpcEgressSetting,
   IngressSetting,
   EventHandlerOptions,
-} from './options';
+} from "./options";
 
-export { Change } from '../common/change';
-
-export { CloudFunction, CloudEvent } from './core';
+export { CloudFunction, CloudEvent, ParamsOf } from "./core";
+export { Change } from "../common/change";
diff --git a/src/v2/options.ts b/src/v2/options.ts
index b8a5a5dcd..fc85bf148 100644
--- a/src/v2/options.ts
+++ b/src/v2/options.ts
@@ -25,69 +25,63 @@
  * @packageDocumentation
  */
 
-import {
-  convertIfPresent,
-  copyIfPresent,
-  durationFromSeconds,
-  serviceAccountFromShorthand,
-} from '../common/encoding';
-import * as logger from '../logger';
-import { ManifestEndpoint } from '../runtime/manifest';
-import { TriggerAnnotation } from './core';
-import { declaredParams, Expression } from './params';
-import { ParamSpec } from './params/types';
-import { HttpsOptions } from './providers/https';
+import { convertIfPresent, copyIfPresent } from "../common/encoding";
+import { RESET_VALUE, ResetValue } from "../common/options";
+import { ManifestEndpoint } from "../runtime/manifest";
+import { declaredParams, Expression } from "../params";
+import { ParamSpec, SecretParam } from "../params/types";
+import { HttpsOptions } from "./providers/https";
+import * as logger from "../logger";
+
+export { RESET_VALUE } from "../common/options";
 
 /**
  * List of all regions supported by Cloud Functions v2
  */
 export type SupportedRegion =
-  | 'asia-northeast1'
-  | 'europe-north1'
-  | 'europe-west1'
-  | 'europe-west4'
-  | 'us-central1'
-  | 'us-east1'
-  | 'us-west1';
+  | "asia-northeast1"
+  | "europe-north1"
+  | "europe-west1"
+  | "europe-west4"
+  | "us-central1"
+  | "us-east1"
+  | "us-west1";
 
 /**
  * List of available memory options supported by Cloud Functions.
  */
 export type MemoryOption =
-  | '128MiB'
-  | '256MiB'
-  | '512MiB'
-  | '1GiB'
-  | '2GiB'
-  | '4GiB'
-  | '8GiB'
-  | '16GiB'
-  | '32GiB';
+  | "128MiB"
+  | "256MiB"
+  | "512MiB"
+  | "1GiB"
+  | "2GiB"
+  | "4GiB"
+  | "8GiB"
+  | "16GiB"
+  | "32GiB";
 
 const MemoryOptionToMB: Record<MemoryOption, number> = {
-  '128MiB': 128,
-  '256MiB': 256,
-  '512MiB': 512,
-  '1GiB': 1024,
-  '2GiB': 2048,
-  '4GiB': 4096,
-  '8GiB': 8192,
-  '16GiB': 16384,
-  '32GiB': 32768,
+  "128MiB": 128,
+  "256MiB": 256,
+  "512MiB": 512,
+  "1GiB": 1024,
+  "2GiB": 2048,
+  "4GiB": 4096,
+  "8GiB": 8192,
+  "16GiB": 16384,
+  "32GiB": 32768,
 };
 
 /**
  * List of available options for VpcConnectorEgressSettings.
  */
-export type VpcEgressSetting = 'PRIVATE_RANGES_ONLY' | 'ALL_TRAFFIC';
+export type VpcEgressSetting = "PRIVATE_RANGES_ONLY" | "ALL_TRAFFIC";
 
 /**
  * List of available options for IngressSettings.
  */
-export type IngressSetting =
-  | 'ALLOW_ALL'
-  | 'ALLOW_INTERNAL_ONLY'
-  | 'ALLOW_INTERNAL_AND_GCLB';
+export type IngressSetting = "ALLOW_ALL" | "ALLOW_INTERNAL_ONLY" | "ALLOW_INTERNAL_AND_GCLB";
 
 /**
  * GlobalOptions are options that can be set across an entire project.
@@ -96,99 +90,119 @@ export type IngressSetting =
 export interface GlobalOptions {
   /**
    * Region where functions should be deployed.
-   * HTTP functions can override and specify more than one region.
    */
   region?: SupportedRegion | string;
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: MemoryOption | Expression<number> | null;
+  memory?: MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: IngressSetting | null;
+  ingressSettings?: IngressSetting | ResetValue;
 
   /**
-   * User labels to set on the function.
+   * Invoker to set access control on https functions.
    */
-  labels?: Record<string, string>;
+  invoker?: "public" | "private" | string | string[];
 
   /**
-   * Invoker to set access control on https functions.
+   * User labels to set on the function.
    */
-  invoker?: 'public' | 'private' | string | string[];
+  labels?: Record<string, string>;
 
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
+
+  /**
+   * Determines whether Firebase AppCheck is enforced. Defaults to false.
+   *
+   * @remarks
+   * When true, requests with invalid tokens autorespond with a 401
+   * (Unauthorized) error.
+   * When false, requests with invalid tokens set event.app to undefiend.
+   */
+  enforceAppCheck?: boolean;
+
+  /**
+   * Controls whether function configuration modified outside of function source is preserved. Defaults to false.
+   *
+   * @remarks
+   * When setting configuration available in the underlying platform that is not yet available in the Firebase Functions
+   * SDK, we highly recommend setting preserveExternalChanges to true. Otherwise, when Firebase Functions SDK releases
+   * a new version of the SDK with the support for the missing configuration, your functions manually configured setting
+   * may inadvertently be wiped out.
+   */
+  preserveExternalChanges?: boolean;
 }
 
 let globalOptions: GlobalOptions | undefined;
@@ -199,7 +213,7 @@ let globalOptions: GlobalOptions | undefined;
  */
 export function setGlobalOptions(options: GlobalOptions) {
   if (globalOptions) {
-    logger.warn('Calling setGlobalOptions twice leads to undefined behavior');
+    logger.warn("Calling setGlobalOptions twice leads to undefined behavior");
   }
   globalOptions = options;
 }
@@ -216,88 +230,26 @@ export function getGlobalOptions(): GlobalOptions {
 /**
  * Additional fields that can be set on any event-handling Cloud Function.
  */
-export interface EventHandlerOptions extends GlobalOptions {
+export interface EventHandlerOptions extends Omit<GlobalOptions, "enforceAppCheck"> {
   eventType?: string;
 
   eventFilters?: Record<string, string | Expression<string>>;
   eventFilterPathPatterns?: Record<string, string | Expression<string>>;
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean | Expression<boolean> | null;
+  retry?: boolean | Expression<boolean> | ResetValue;
 
   /** Region of the EventArc trigger. */
-  //region?: string | Expression<string> | null;
+  // region?: string | Expression<string> | null;
   region?: string;
 
   /** The service account that EventArc should use to invoke this function. Requires the P4SA to have ActAs permission on this service account. */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /** The name of the channel where the function receives events. */
   channel?: string;
 }
 
-/**
- * Apply GlobalOptions to trigger definitions.
- * @internal
- */
-export function optionsToTriggerAnnotations(
-  opts: GlobalOptions | EventHandlerOptions | HttpsOptions
-): TriggerAnnotation {
-  const annotation: TriggerAnnotation = {};
-  copyIfPresent(
-    annotation,
-    opts,
-    'concurrency',
-    'minInstances',
-    'maxInstances',
-    'ingressSettings',
-    'labels',
-    'vpcConnector',
-    'vpcConnectorEgressSettings',
-    'secrets'
-  );
-  convertIfPresent(
-    annotation,
-    opts,
-    'availableMemoryMb',
-    'memory',
-    (mem: MemoryOption | Expression<number>): number | Expression<number> => {
-      return typeof mem === 'object' ? mem : MemoryOptionToMB[mem];
-    }
-  );
-  convertIfPresent(annotation, opts, 'regions', 'region', (region) => {
-    if (typeof region === 'string') {
-      return [region];
-    }
-    return region;
-  });
-  convertIfPresent(
-    annotation,
-    opts,
-    'serviceAccountEmail',
-    'serviceAccount',
-    serviceAccountFromShorthand
-  );
-  convertIfPresent(
-    annotation,
-    opts,
-    'timeout',
-    'timeoutSeconds',
-    durationFromSeconds
-  );
-  convertIfPresent(
-    annotation,
-    (opts as any) as EventHandlerOptions,
-    'failurePolicy',
-    'retry',
-    (retry: boolean) => {
-      return retry ? { retry: true } : null;
-    }
-  );
-
-  return annotation;
-}
-
 /**
  * Apply GlobalOptions to endpoint manifest.
  * @internal
@@ -309,31 +261,37 @@ export function optionsToEndpoint(
   copyIfPresent(
     endpoint,
     opts,
-    'concurrency',
-    'minInstances',
-    'maxInstances',
-    'ingressSettings',
-    'labels',
-    'timeoutSeconds',
-    'cpu'
+    "concurrency",
+    "minInstances",
+    "maxInstances",
+    "ingressSettings",
+    "labels",
+    "timeoutSeconds",
+    "cpu"
   );
-  convertIfPresent(endpoint, opts, 'serviceAccountEmail', 'serviceAccount');
-  if (opts.vpcConnector) {
-    const vpc: ManifestEndpoint['vpc'] = { connector: opts.vpcConnector };
-    convertIfPresent(vpc, opts, 'egressSettings', 'vpcConnectorEgressSettings');
-    endpoint.vpc = vpc;
+  convertIfPresent(endpoint, opts, "serviceAccountEmail", "serviceAccount");
+  if (opts.vpcConnector !== undefined) {
+    if (opts.vpcConnector === null || opts.vpcConnector instanceof ResetValue) {
+      endpoint.vpc = RESET_VALUE;
+    } else {
+      const vpc: ManifestEndpoint["vpc"] = { connector: opts.vpcConnector };
+      convertIfPresent(vpc, opts, "egressSettings", "vpcConnectorEgressSettings");
+      endpoint.vpc = vpc;
+    }
   }
   convertIfPresent(
     endpoint,
     opts,
-    'availableMemoryMb',
-    'memory',
-    (mem: MemoryOption | Expression<number>): number | Expression<number> => {
-      return typeof mem === 'object' ? mem : MemoryOptionToMB[mem];
+    "availableMemoryMb",
+    "memory",
+    (
+      mem: MemoryOption | Expression<number> | ResetValue | null
+    ): number | Expression<number> | null | ResetValue => {
+      return typeof mem === "object" ? mem : MemoryOptionToMB[mem];
     }
   );
-  convertIfPresent(endpoint, opts, 'region', 'region', (region) => {
-    if (typeof region === 'string') {
+  convertIfPresent(endpoint, opts, "region", "region", (region) => {
+    if (typeof region === "string") {
       return [region];
     }
     return region;
@@ -341,9 +299,10 @@ export function optionsToEndpoint(
   convertIfPresent(
     endpoint,
     opts,
-    'secretEnvironmentVariables',
-    'secrets',
-    (secrets) => secrets.map((secret) => ({ key: secret }))
+    "secretEnvironmentVariables",
+    "secrets",
+    (secrets: (string | SecretParam)[]) =>
+      secrets.map((secret) => ({ key: secret instanceof SecretParam ? secret.name : secret }))
   );
 
   return endpoint;
@@ -355,7 +314,7 @@ export function optionsToEndpoint(
  */
 export function __getSpec(): {
   globalOptions: GlobalOptions;
-  params: ParamSpec[];
+  params: ParamSpec<any>[];
 } {
   return {
     globalOptions: getGlobalOptions(),
diff --git a/src/v2/params/types.ts b/src/v2/params/types.ts
deleted file mode 100644
index b138150db..000000000
--- a/src/v2/params/types.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2021 Firebase
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-/*
- * A CEL expression which can be evaluated during function deployment, and
- * resolved to a value of the generic type parameter: i.e, you can pass
- * an Expression<number> as the value of an option that normally accepts numbers.
- */
-export abstract class Expression<
-  T extends string | number | boolean | string[]
-> {
-  // Returns the Expression's runtime value, based on the CLI's resolution of params.
-  value(): T {
-    throw new Error('Not implemented');
-  }
-
-  // Returns the Expression's representation as a braced CEL expression.
-  toCEL(): string {
-    return `{{ ${this.toString()} }}`;
-  }
-
-  toJSON(): string {
-    return this.toString();
-  }
-}
-
-function quoteIfString<T extends string | number | boolean | string[]>(
-  literal: T
-): T {
-  // TODO(vsfan@): CEL's string escape semantics are slightly different than Javascript's, what do we do here?
-  return typeof literal === 'string' ? (`"${literal}"` as T) : literal;
-}
-
-/**
- * A CEL expression corresponding to a ternary operator, e.g {{ cond ? ifTrue : ifFalse }}
- */
-export class TernaryExpression<
-  T extends string | number | boolean | string[]
-> extends Expression<T> {
-  constructor(
-    private readonly test: Expression<boolean>,
-    private readonly ifTrue: T,
-    private readonly ifFalse: T
-  ) {
-    super();
-    this.ifTrue = ifTrue;
-    this.ifFalse = ifFalse;
-  }
-
-  value(): T {
-    return !!this.test.value ? this.ifTrue : this.ifFalse;
-  }
-
-  toString() {
-    return `${this.test} ? ${quoteIfString(this.ifTrue)} : ${quoteIfString(
-      this.ifFalse
-    )}`;
-  }
-}
-
-/**
- * A CEL expression that evaluates to boolean true or false based on a comparison
- * between the value of another expression and a literal of that same type.
- */
-export class CompareExpression<
-  T extends string | number | boolean | string[]
-> extends Expression<boolean> {
-  cmp: '==' | '>' | '>=' | '<' | '<=';
-  lhs: Expression<T>;
-  rhs: T;
-
-  constructor(cmp: '==' | '>' | '>=' | '<' | '<=', lhs: Expression<T>, rhs: T) {
-    super();
-    this.cmp = cmp;
-    this.lhs = lhs;
-    this.rhs = rhs;
-  }
-
-  value(): boolean {
-    const left = this.lhs.value();
-    switch (this.cmp) {
-      case '==':
-        return left === this.rhs;
-      case '>':
-        return left > this.rhs;
-      case '>=':
-        return left >= this.rhs;
-      case '<':
-        return left < this.rhs;
-      case '<=':
-        return left <= this.rhs;
-      default:
-        throw new Error('Unknown comparator ' + this.cmp);
-    }
-  }
-
-  toString() {
-    return `${this.lhs} ${this.cmp} ${quoteIfString(this.rhs)}`;
-  }
-
-  then(ifTrue: T, ifFalse: T) {
-    return new TernaryExpression(this, ifTrue, ifFalse);
-  }
-}
-
-/** @hidden */
-type ParamValueType =
-  | 'string'
-  | 'list'
-  | 'boolean'
-  | 'int'
-  | 'float'
-  | 'secret';
-
-type ParamInput<T> =
-  | { text: TextInput<T> }
-  | { select: SelectInput<T> }
-  | { resource: ResourceInput };
-
-/**
- * Specifies that a Param's value should be determined by prompting the user
- * to type it in interactively at deploy-time. Input that does not match the
- * provided validationRegex, if present, will be retried.
- */
-export interface TextInput<T = unknown> {
-  example?: string;
-  validationRegex?: string;
-  validationErrorMessage?: string;
-}
-
-/**
- * Specifies that a Param's value should be determined by having the user
- * select from a list containing all the project's resources of a certain
- * type. Currently, only type:"storage.googleapis.com/Bucket" is supported.
- */
-export interface ResourceInput {
-  resource: {
-    type: string;
-  };
-}
-
-/**
- * Specifies that a Param's value should be determined by having the user select
- * from a list of pre-canned options interactively at deploy-time.
- */
-export interface SelectInput<T = unknown> {
-  options: Array<SelectOptions<T>>;
-}
-
-export interface SelectOptions<T = unknown> {
-  label?: string;
-  value: T;
-}
-
-export interface ParamSpec<T = unknown> {
-  name: string;
-  default?: T;
-  label?: string;
-  description?: string;
-  type: ParamValueType;
-  input?: ParamInput<T>;
-}
-
-export type ParamOptions<T = unknown> = Omit<ParamSpec<T>, 'name' | 'type'>;
-
-export abstract class Param<
-  T extends string | number | boolean | string[]
-> extends Expression<T> {
-  static type: ParamValueType = 'string';
-
-  constructor(readonly name: string, readonly options: ParamOptions<T> = {}) {
-    super();
-  }
-
-  value(): T {
-    throw new Error('Not implemented');
-  }
-
-  cmp(cmp: '==' | '>' | '>=' | '<' | '<=', rhs: T) {
-    return new CompareExpression<T>(cmp, this, rhs);
-  }
-
-  equals(rhs: T) {
-    return this.cmp('==', rhs);
-  }
-
-  toString(): string {
-    return `params.${this.name}`;
-  }
-
-  toSpec(): ParamSpec<T> {
-    const out: ParamSpec = {
-      name: this.name,
-      ...this.options,
-      type: (this.constructor as typeof Param).type,
-    };
-
-    return out as ParamSpec<T>;
-  }
-}
-
-export class SecretParam {
-  static type: ParamValueType = 'secret';
-  name: string;
-
-  constructor(name: string) {
-    this.name = name;
-  }
-
-  value(): string {
-    return process.env[this.name] || '';
-  }
-
-  toSpec(): ParamSpec<string> {
-    return {
-      type: 'secret',
-      name: this.name,
-    };
-  }
-}
-
-export class StringParam extends Param<string> {
-  value(): string {
-    return process.env[this.name] || '';
-  }
-}
-
-export class IntParam extends Param<number> {
-  static type: ParamValueType = 'int';
-
-  value(): number {
-    return parseInt(process.env[this.name] || '0', 10) || 0;
-  }
-}
-
-export class FloatParam extends Param<number> {
-  static type: ParamValueType = 'float';
-
-  value(): number {
-    return parseFloat(process.env[this.name] || '0') || 0;
-  }
-}
-
-export class BooleanParam extends Param<boolean> {
-  static type: ParamValueType = 'boolean';
-
-  value(): boolean {
-    return !!process.env[this.name];
-  }
-
-  then<T extends string | number | boolean>(ifTrue: T, ifFalse: T) {
-    return new TernaryExpression(this, ifTrue, ifFalse);
-  }
-}
-
-export class ListParam extends Param<string[]> {
-  static type: ParamValueType = 'list';
-
-  value(): string[] {
-    throw new Error('Not implemented');
-  }
-
-  toSpec(): ParamSpec<string[]> {
-    const out: ParamSpec = {
-      name: this.name,
-      type: 'list',
-      ...this.options,
-    };
-    if (this.options.default && this.options.default.length > 0) {
-      out.default = this.options.default.join(',');
-    }
-
-    return out as ParamSpec<string[]>;
-  }
-}
diff --git a/src/v2/providers/alerts/alerts.ts b/src/v2/providers/alerts/alerts.ts
index b36fb0c55..3b544ecd1 100644
--- a/src/v2/providers/alerts/alerts.ts
+++ b/src/v2/providers/alerts/alerts.ts
@@ -20,10 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { ManifestEndpoint } from '../../../runtime/manifest';
-import { CloudEvent, CloudFunction } from '../../core';
-import * as options from '../../options';
-import { Expression } from '../../params';
+import { initV2Endpoint, ManifestEndpoint } from "../../../runtime/manifest";
+import { ResetValue } from "../../../common/options";
+import { CloudEvent, CloudFunction } from "../../core";
+import { Expression } from "../../../params";
+import { wrapTraceContext } from "../../trace";
+import * as options from "../../options";
+import { SecretParam } from "../../../params/types";
 
 /**
  * The CloudEvent data emitted by Firebase Alerts.
@@ -56,21 +59,21 @@ export interface AlertEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
 }
 
 /** @internal */
-export const eventType = 'google.firebase.firebasealerts.alerts.v1.published';
+export const eventType = "google.firebase.firebasealerts.alerts.v1.published";
 
 /** The underlying alert type of the Firebase Alerts provider. */
 export type AlertType =
-  | 'crashlytics.newFatalIssue'
-  | 'crashlytics.newNonfatalIssue'
-  | 'crashlytics.regression'
-  | 'crashlytics.stabilityDigest'
-  | 'crashlytics.velocity'
-  | 'crashlytics.newAnrIssue'
-  | 'billing.planUpdate'
-  | 'billing.automatedPlanUpdate'
-  | 'appDistribution.newTesterIosDevice'
-  | 'appDistribution.inAppFeedback'
-  | 'performance.threshold'
+  | "crashlytics.newFatalIssue"
+  | "crashlytics.newNonfatalIssue"
+  | "crashlytics.regression"
+  | "crashlytics.stabilityDigest"
+  | "crashlytics.velocity"
+  | "crashlytics.newAnrIssue"
+  | "billing.planUpdate"
+  | "billing.automatedPlanUpdate"
+  | "appDistribution.newTesterIosDevice"
+  | "appDistribution.inAppFeedback"
+  | "performance.threshold"
   | string;
 
 /**
@@ -92,7 +95,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
    * Amount of memory to allocate to a function.
    * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
@@ -104,7 +107,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
@@ -112,13 +115,13 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
    * while idle.
    * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
    * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
@@ -127,7 +130,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
@@ -137,31 +140,31 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
    * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
    * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
    * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
    * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -171,10 +174,10 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -184,7 +187,7 @@ export interface FirebaseAlertOptions extends options.EventHandlerOptions {
  * @param handler a function that can handle the Firebase Alert inside a CloudEvent.
  * @returns A function that you can export and deploy.
  */
-export function onAlertPublished<T extends { ['@type']: string } = any>(
+export function onAlertPublished<T extends { ["@type"]: string } = any>(
   alertType: AlertType,
   handler: (event: AlertEvent<T>) => any | Promise<any>
 ): CloudFunction<AlertEvent<T>>;
@@ -195,19 +198,19 @@ export function onAlertPublished<T extends { ['@type']: string } = any>(
  * @param options - the alert type and other options for this cloud function.
  * @param handler a function that can handle the Firebase Alert inside a CloudEvent.
  */
-export function onAlertPublished<T extends { ['@type']: string } = any>(
+export function onAlertPublished<T extends { ["@type"]: string } = any>(
   options: FirebaseAlertOptions,
   handler: (event: AlertEvent<T>) => any | Promise<any>
 ): CloudFunction<AlertEvent<T>>;
 
-export function onAlertPublished<T extends { ['@type']: string } = any>(
+export function onAlertPublished<T extends { ["@type"]: string } = any>(
   alertTypeOrOpts: AlertType | FirebaseAlertOptions,
   handler: (event: AlertEvent<T>) => any | Promise<any>
 ): CloudFunction<AlertEvent<T>> {
   const [opts, alertType, appId] = getOptsAndAlertTypeAndApp(alertTypeOrOpts);
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(convertAlertAndApp(raw) as AlertEvent<T>);
+    return wrapTraceContext(handler(convertAlertAndApp(raw) as AlertEvent<T>));
   };
 
   func.run = handler;
@@ -228,7 +231,8 @@ export function getEndpointAnnotation(
   const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
   const specificOpts = options.optionsToEndpoint(opts);
   const endpoint: ManifestEndpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
@@ -259,7 +263,7 @@ export function getOptsAndAlertTypeAndApp(
   let opts: options.EventHandlerOptions;
   let alertType: AlertType;
   let appId: string | undefined;
-  if (typeof alertTypeOrOpts === 'string') {
+  if (typeof alertTypeOrOpts === "string") {
     alertType = alertTypeOrOpts;
     opts = {};
   } else {
@@ -276,15 +280,13 @@ export function getOptsAndAlertTypeAndApp(
  * Helper function to covert alert type & app id in the CloudEvent to camel case.
  * @internal
  */
-export function convertAlertAndApp(
-  raw: CloudEvent<unknown>
-): CloudEvent<unknown> {
+export function convertAlertAndApp(raw: CloudEvent<unknown>): CloudEvent<unknown> {
   const event = { ...raw };
 
-  if ('alerttype' in event) {
+  if ("alerttype" in event) {
     (event as any).alertType = (event as any).alerttype;
   }
-  if ('appid' in event) {
+  if ("appid" in event) {
     (event as any).appId = (event as any).appid;
   }
 
diff --git a/src/v2/providers/alerts/appDistribution.ts b/src/v2/providers/alerts/appDistribution.ts
index 3446379e4..cd3b3704a 100644
--- a/src/v2/providers/alerts/appDistribution.ts
+++ b/src/v2/providers/alerts/appDistribution.ts
@@ -25,21 +25,20 @@
  * @packageDocumentation
  */
 
-import { CloudEvent, CloudFunction } from '../../core';
-import * as options from '../../options';
-import { Expression } from '../../params';
-import {
-  convertAlertAndApp,
-  FirebaseAlertData,
-  getEndpointAnnotation,
-} from './alerts';
+import { ResetValue } from "../../../common/options";
+import { Expression } from "../../../params";
+import { CloudEvent, CloudFunction } from "../../core";
+import { wrapTraceContext } from "../../trace";
+import { convertAlertAndApp, FirebaseAlertData, getEndpointAnnotation } from "./alerts";
+import * as options from "../../options";
+import { SecretParam } from "../../../params/types";
 
 /**
  * The internal payload object for adding a new tester device to app distribution.
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface NewTesterDevicePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroNewTesterIosDevicePayload";
   /** Name of the tester */
   testerName: string;
   /** Email of the tester */
@@ -57,7 +56,7 @@ export interface NewTesterDevicePayload {
  * @alpha
  */
 export interface InAppFeedbackPayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.AppDistroInAppFeedbackPayload";
   /** Resource name. Format: `projects/{project_number}/apps/{app_id}/releases/{release_id}/feedbackReports/{feedback_id}` */
   feedbackReport: string;
   /** Deep link back to the Firebase console. */
@@ -81,8 +80,7 @@ export interface InAppFeedbackPayload {
  * A custom CloudEvent for Firebase Alerts (with custom extension attributes).
  * @typeParam T - the data type for app distribution alerts that is wrapped in a `FirebaseAlertData` object.
  */
-export interface AppDistributionEvent<T>
-  extends CloudEvent<FirebaseAlertData<T>> {
+export interface AppDistributionEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
   /** The type of the alerts that got triggered. */
   alertType: string;
   /** The Firebase App ID that’s associated with the alert. */
@@ -90,9 +88,9 @@ export interface AppDistributionEvent<T>
 }
 
 /** @internal */
-export const newTesterIosDeviceAlert = 'appDistribution.newTesterIosDevice';
+export const newTesterIosDeviceAlert = "appDistribution.newTesterIosDevice";
 /** @internal */
-export const inAppFeedbackAlert = 'appDistribution.inAppFeedback';
+export const inAppFeedbackAlert = "appDistribution.inAppFeedback";
 
 /**
  * Configuration for app distribution functions.
@@ -108,78 +106,78 @@ export interface AppDistributionOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -189,10 +187,10 @@ export interface AppDistributionOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -201,9 +199,7 @@ export interface AppDistributionOptions extends options.EventHandlerOptions {
  * @returns A function that you can export and deploy.
  */
 export function onNewTesterIosDevicePublished(
-  handler: (
-    event: AppDistributionEvent<NewTesterDevicePayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<NewTesterDevicePayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<NewTesterDevicePayload>>;
 
 /**
@@ -214,9 +210,7 @@ export function onNewTesterIosDevicePublished(
  */
 export function onNewTesterIosDevicePublished(
   appId: string,
-  handler: (
-    event: AppDistributionEvent<NewTesterDevicePayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<NewTesterDevicePayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<NewTesterDevicePayload>>;
 
 /**
@@ -227,9 +221,7 @@ export function onNewTesterIosDevicePublished(
  */
 export function onNewTesterIosDevicePublished(
   opts: AppDistributionOptions,
-  handler: (
-    event: AppDistributionEvent<NewTesterDevicePayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<NewTesterDevicePayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<NewTesterDevicePayload>>;
 
 /**
@@ -242,14 +234,10 @@ export function onNewTesterIosDevicePublished(
   appIdOrOptsOrHandler:
     | string
     | AppDistributionOptions
-    | ((
-        event: AppDistributionEvent<NewTesterDevicePayload>
-      ) => any | Promise<any>),
-  handler?: (
-    event: AppDistributionEvent<NewTesterDevicePayload>
-  ) => any | Promise<any>
+    | ((event: AppDistributionEvent<NewTesterDevicePayload>) => any | Promise<any>),
+  handler?: (event: AppDistributionEvent<NewTesterDevicePayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<NewTesterDevicePayload>> {
-  if (typeof appIdOrOptsOrHandler === 'function') {
+  if (typeof appIdOrOptsOrHandler === "function") {
     handler = appIdOrOptsOrHandler as (
       event: AppDistributionEvent<NewTesterDevicePayload>
     ) => any | Promise<any>;
@@ -259,8 +247,8 @@ export function onNewTesterIosDevicePublished(
   const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler);
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(
-      convertAlertAndApp(raw) as AppDistributionEvent<NewTesterDevicePayload>
+    return wrapTraceContext(
+      handler(convertAlertAndApp(raw) as AppDistributionEvent<NewTesterDevicePayload>)
     );
   };
 
@@ -278,9 +266,7 @@ export function onNewTesterIosDevicePublished(
  * @alpha
  */
 export function onInAppFeedbackPublished(
-  handler: (
-    event: AppDistributionEvent<InAppFeedbackPayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;
 
 /**
@@ -293,9 +279,7 @@ export function onInAppFeedbackPublished(
  */
 export function onInAppFeedbackPublished(
   appId: string,
-  handler: (
-    event: AppDistributionEvent<InAppFeedbackPayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;
 
 /**
@@ -308,9 +292,7 @@ export function onInAppFeedbackPublished(
  */
 export function onInAppFeedbackPublished(
   opts: AppDistributionOptions,
-  handler: (
-    event: AppDistributionEvent<InAppFeedbackPayload>
-  ) => any | Promise<any>
+  handler: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>>;
 
 /**
@@ -325,14 +307,10 @@ export function onInAppFeedbackPublished(
   appIdOrOptsOrHandler:
     | string
     | AppDistributionOptions
-    | ((
-        event: AppDistributionEvent<InAppFeedbackPayload>
-      ) => any | Promise<any>),
-  handler?: (
-    event: AppDistributionEvent<InAppFeedbackPayload>
-  ) => any | Promise<any>
+    | ((event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>),
+  handler?: (event: AppDistributionEvent<InAppFeedbackPayload>) => any | Promise<any>
 ): CloudFunction<AppDistributionEvent<InAppFeedbackPayload>> {
-  if (typeof appIdOrOptsOrHandler === 'function') {
+  if (typeof appIdOrOptsOrHandler === "function") {
     handler = appIdOrOptsOrHandler as (
       event: AppDistributionEvent<InAppFeedbackPayload>
     ) => any | Promise<any>;
@@ -342,8 +320,8 @@ export function onInAppFeedbackPublished(
   const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler);
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(
-      convertAlertAndApp(raw) as AppDistributionEvent<InAppFeedbackPayload>
+    return wrapTraceContext(
+      handler(convertAlertAndApp(raw) as AppDistributionEvent<InAppFeedbackPayload>)
     );
   };
 
@@ -362,7 +340,7 @@ export function getOptsAndApp(
 ): [options.EventHandlerOptions, string | undefined] {
   let opts: options.EventHandlerOptions;
   let appId: string | undefined;
-  if (typeof appIdOrOpts === 'string') {
+  if (typeof appIdOrOpts === "string") {
     opts = {};
     appId = appIdOrOpts;
   } else {
diff --git a/src/v2/providers/alerts/billing.ts b/src/v2/providers/alerts/billing.ts
index 955fd8791..afff1cba8 100644
--- a/src/v2/providers/alerts/billing.ts
+++ b/src/v2/providers/alerts/billing.ts
@@ -25,20 +25,17 @@
  * @packageDocumentation
  */
 
-import { CloudEvent, CloudFunction } from '../../core';
-import * as options from '../../options';
-import {
-  convertAlertAndApp,
-  FirebaseAlertData,
-  getEndpointAnnotation,
-} from './alerts';
+import { CloudEvent, CloudFunction } from "../../core";
+import { wrapTraceContext } from "../../trace";
+import { convertAlertAndApp, FirebaseAlertData, getEndpointAnnotation } from "./alerts";
+import * as options from "../../options";
 
 /**
  * The internal payload object for billing plan updates.
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface PlanUpdatePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanUpdatePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanUpdatePayload";
   /** A Firebase billing plan. */
   billingPlan: string;
   /** The email address of the person that triggered billing plan change */
@@ -52,7 +49,7 @@ export interface PlanUpdatePayload {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface PlanAutomatedUpdatePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanAutomatedUpdatePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.BillingPlanAutomatedUpdatePayload";
   /** A Firebase billing plan. */
   billingPlan: string;
   /** The type of the notification, e.g. upgrade, downgrade */
@@ -69,9 +66,9 @@ export interface BillingEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
 }
 
 /** @internal */
-export const planUpdateAlert = 'billing.planUpdate';
+export const planUpdateAlert = "billing.planUpdate";
 /** @internal */
-export const planAutomatedUpdateAlert = 'billing.planAutomatedUpdate';
+export const planAutomatedUpdateAlert = "billing.planAutomatedUpdate";
 
 /**
  * Declares a function that can handle a billing plan update event.
@@ -105,11 +102,7 @@ export function onPlanUpdatePublished(
     | ((event: BillingEvent<PlanUpdatePayload>) => any | Promise<any>),
   handler?: (event: BillingEvent<PlanUpdatePayload>) => any | Promise<any>
 ): CloudFunction<BillingEvent<PlanUpdatePayload>> {
-  return onOperation<PlanUpdatePayload>(
-    planUpdateAlert,
-    optsOrHandler,
-    handler
-  );
+  return onOperation<PlanUpdatePayload>(planUpdateAlert, optsOrHandler, handler);
 }
 
 /**
@@ -118,9 +111,7 @@ export function onPlanUpdatePublished(
  * @returns A function that you can export and deploy.
  */
 export function onPlanAutomatedUpdatePublished(
-  handler: (
-    event: BillingEvent<PlanAutomatedUpdatePayload>
-  ) => any | Promise<any>
+  handler: (event: BillingEvent<PlanAutomatedUpdatePayload>) => any | Promise<any>
 ): CloudFunction<BillingEvent<PlanAutomatedUpdatePayload>>;
 
 /**
@@ -131,9 +122,7 @@ export function onPlanAutomatedUpdatePublished(
  */
 export function onPlanAutomatedUpdatePublished(
   opts: options.EventHandlerOptions,
-  handler: (
-    event: BillingEvent<PlanAutomatedUpdatePayload>
-  ) => any | Promise<any>
+  handler: (event: BillingEvent<PlanAutomatedUpdatePayload>) => any | Promise<any>
 ): CloudFunction<BillingEvent<PlanAutomatedUpdatePayload>>;
 
 /**
@@ -146,32 +135,24 @@ export function onPlanAutomatedUpdatePublished(
   optsOrHandler:
     | options.EventHandlerOptions
     | ((event: BillingEvent<PlanAutomatedUpdatePayload>) => any | Promise<any>),
-  handler?: (
-    event: BillingEvent<PlanAutomatedUpdatePayload>
-  ) => any | Promise<any>
+  handler?: (event: BillingEvent<PlanAutomatedUpdatePayload>) => any | Promise<any>
 ): CloudFunction<BillingEvent<PlanAutomatedUpdatePayload>> {
-  return onOperation<PlanAutomatedUpdatePayload>(
-    planAutomatedUpdateAlert,
-    optsOrHandler,
-    handler
-  );
+  return onOperation<PlanAutomatedUpdatePayload>(planAutomatedUpdateAlert, optsOrHandler, handler);
 }
 
 /** @internal */
 export function onOperation<T>(
   alertType: string,
-  optsOrHandler:
-    | options.EventHandlerOptions
-    | ((event: BillingEvent<T>) => any | Promise<any>),
+  optsOrHandler: options.EventHandlerOptions | ((event: BillingEvent<T>) => any | Promise<any>),
   handler: (event: BillingEvent<T>) => any | Promise<any>
 ): CloudFunction<BillingEvent<T>> {
-  if (typeof optsOrHandler === 'function') {
+  if (typeof optsOrHandler === "function") {
     handler = optsOrHandler as (event: BillingEvent<T>) => any | Promise<any>;
     optsOrHandler = {};
   }
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(convertAlertAndApp(raw) as BillingEvent<T>);
+    return wrapTraceContext(handler(convertAlertAndApp(raw) as BillingEvent<T>));
   };
 
   func.run = handler;
diff --git a/src/v2/providers/alerts/crashlytics.ts b/src/v2/providers/alerts/crashlytics.ts
index 1e6345b41..e142406b6 100644
--- a/src/v2/providers/alerts/crashlytics.ts
+++ b/src/v2/providers/alerts/crashlytics.ts
@@ -25,14 +25,13 @@
  * @packageDocumentation
  */
 
-import { CloudEvent, CloudFunction } from '../../core';
-import * as options from '../../options';
-import { Expression } from '../../params';
-import {
-  convertAlertAndApp,
-  FirebaseAlertData,
-  getEndpointAnnotation,
-} from './alerts';
+import { ResetValue } from "../../../common/options";
+import { Expression } from "../../../params";
+import { CloudEvent, CloudFunction } from "../../core";
+import { wrapTraceContext } from "../../trace";
+import { convertAlertAndApp, FirebaseAlertData, getEndpointAnnotation } from "./alerts";
+import * as options from "../../options";
+import { SecretParam } from "../../../params/types";
 
 /** Generic Crashlytics issue interface */
 export interface Issue {
@@ -51,7 +50,7 @@ export interface Issue {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface NewFatalIssuePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewFatalIssuePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewFatalIssuePayload";
   /** Basic information of the Crashlytics issue */
   issue: Issue;
 }
@@ -61,7 +60,7 @@ export interface NewFatalIssuePayload {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface NewNonfatalIssuePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewNonfatalIssuePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewNonfatalIssuePayload";
   /** Basic information of the Crashlytics issue */
   issue: Issue;
 }
@@ -71,7 +70,7 @@ export interface NewNonfatalIssuePayload {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface RegressionAlertPayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsRegressionAlertPayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsRegressionAlertPayload";
   /** The type of the Crashlytics issue, e.g. new fatal, new nonfatal, ANR */
   type: string;
   /** Basic information of the Crashlytics issue */
@@ -100,7 +99,7 @@ export interface TrendingIssueDetails {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface StabilityDigestPayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsStabilityDigestPayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsStabilityDigestPayload";
   /**
    * The date that the digest gets created. Issues in the digest should have the
    * same date as the digest date
@@ -115,7 +114,7 @@ export interface StabilityDigestPayload {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface VelocityAlertPayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsVelocityAlertPayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsVelocityAlertPayload";
   /** Basic information of the Crashlytics issue */
   issue: Issue;
   /** The time that the Crashlytics issue gets created */
@@ -142,7 +141,7 @@ export interface VelocityAlertPayload {
  * Payload is wrapped inside a `FirebaseAlertData` object.
  */
 export interface NewAnrIssuePayload {
-  ['@type']: 'type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewAnrIssuePayload';
+  ["@type"]: "type.googleapis.com/google.events.firebase.firebasealerts.v1.CrashlyticsNewAnrIssuePayload";
   /** Basic information of the Crashlytics issue */
   issue: Issue;
 }
@@ -159,17 +158,17 @@ export interface CrashlyticsEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
 }
 
 /** @internal */
-export const newFatalIssueAlert = 'crashlytics.newFatalIssue';
+export const newFatalIssueAlert = "crashlytics.newFatalIssue";
 /** @internal */
-export const newNonfatalIssueAlert = 'crashlytics.newNonfatalIssue';
+export const newNonfatalIssueAlert = "crashlytics.newNonfatalIssue";
 /** @internal */
-export const regressionAlert = 'crashlytics.regression';
+export const regressionAlert = "crashlytics.regression";
 /** @internal */
-export const stabilityDigestAlert = 'crashlytics.stabilityDigest';
+export const stabilityDigestAlert = "crashlytics.stabilityDigest";
 /** @internal */
-export const velocityAlert = 'crashlytics.velocity';
+export const velocityAlert = "crashlytics.velocity";
 /** @internal */
-export const newAnrIssueAlert = 'crashlytics.newAnrIssue';
+export const newAnrIssueAlert = "crashlytics.newAnrIssue";
 
 /**
  * Configuration for Crashlytics functions.
@@ -185,78 +184,78 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -266,10 +265,10 @@ export interface CrashlyticsOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -314,15 +313,9 @@ export function onNewFatalIssuePublished(
     | string
     | CrashlyticsOptions
     | ((event: CrashlyticsEvent<NewFatalIssuePayload>) => any | Promise<any>),
-  handler?: (
-    event: CrashlyticsEvent<NewFatalIssuePayload>
-  ) => any | Promise<any>
+  handler?: (event: CrashlyticsEvent<NewFatalIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewFatalIssuePayload>> {
-  return onOperation<NewFatalIssuePayload>(
-    newFatalIssueAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<NewFatalIssuePayload>(newFatalIssueAlert, appIdOrOptsOrHandler, handler);
 }
 
 /**
@@ -331,9 +324,7 @@ export function onNewFatalIssuePublished(
  * @returns A function that you can export and deploy.
  */
 export function onNewNonfatalIssuePublished(
-  handler: (
-    event: CrashlyticsEvent<NewNonfatalIssuePayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<NewNonfatalIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewNonfatalIssuePayload>>;
 
 /**
@@ -344,9 +335,7 @@ export function onNewNonfatalIssuePublished(
  */
 export function onNewNonfatalIssuePublished(
   appId: string,
-  handler: (
-    event: CrashlyticsEvent<NewNonfatalIssuePayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<NewNonfatalIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewNonfatalIssuePayload>>;
 
 /**
@@ -357,9 +346,7 @@ export function onNewNonfatalIssuePublished(
  */
 export function onNewNonfatalIssuePublished(
   opts: CrashlyticsOptions,
-  handler: (
-    event: CrashlyticsEvent<NewNonfatalIssuePayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<NewNonfatalIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewNonfatalIssuePayload>>;
 
 /**
@@ -372,18 +359,10 @@ export function onNewNonfatalIssuePublished(
   appIdOrOptsOrHandler:
     | string
     | CrashlyticsOptions
-    | ((
-        event: CrashlyticsEvent<NewNonfatalIssuePayload>
-      ) => any | Promise<any>),
-  handler?: (
-    event: CrashlyticsEvent<NewNonfatalIssuePayload>
-  ) => any | Promise<any>
+    | ((event: CrashlyticsEvent<NewNonfatalIssuePayload>) => any | Promise<any>),
+  handler?: (event: CrashlyticsEvent<NewNonfatalIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewNonfatalIssuePayload>> {
-  return onOperation<NewNonfatalIssuePayload>(
-    newNonfatalIssueAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<NewNonfatalIssuePayload>(newNonfatalIssueAlert, appIdOrOptsOrHandler, handler);
 }
 
 /**
@@ -392,9 +371,7 @@ export function onNewNonfatalIssuePublished(
  * @returns A function that you can export and deploy.
  */
 export function onRegressionAlertPublished(
-  handler: (
-    event: CrashlyticsEvent<RegressionAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<RegressionAlertPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<RegressionAlertPayload>>;
 
 /**
@@ -406,9 +383,7 @@ export function onRegressionAlertPublished(
  */
 export function onRegressionAlertPublished(
   appId: string,
-  handler: (
-    event: CrashlyticsEvent<RegressionAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<RegressionAlertPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<RegressionAlertPayload>>;
 
 /**
@@ -420,9 +395,7 @@ export function onRegressionAlertPublished(
  */
 export function onRegressionAlertPublished(
   opts: CrashlyticsOptions,
-  handler: (
-    event: CrashlyticsEvent<RegressionAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<RegressionAlertPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<RegressionAlertPayload>>;
 
 /**
@@ -436,15 +409,9 @@ export function onRegressionAlertPublished(
     | string
     | CrashlyticsOptions
     | ((event: CrashlyticsEvent<RegressionAlertPayload>) => any | Promise<any>),
-  handler?: (
-    event: CrashlyticsEvent<RegressionAlertPayload>
-  ) => any | Promise<any>
+  handler?: (event: CrashlyticsEvent<RegressionAlertPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<RegressionAlertPayload>> {
-  return onOperation<RegressionAlertPayload>(
-    regressionAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<RegressionAlertPayload>(regressionAlert, appIdOrOptsOrHandler, handler);
 }
 
 /**
@@ -453,9 +420,7 @@ export function onRegressionAlertPublished(
  * @returns A function that you can export and deploy.
  */
 export function onStabilityDigestPublished(
-  handler: (
-    event: CrashlyticsEvent<StabilityDigestPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<StabilityDigestPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<StabilityDigestPayload>>;
 
 /**
@@ -467,9 +432,7 @@ export function onStabilityDigestPublished(
  */
 export function onStabilityDigestPublished(
   appId: string,
-  handler: (
-    event: CrashlyticsEvent<StabilityDigestPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<StabilityDigestPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<StabilityDigestPayload>>;
 
 /**
@@ -481,9 +444,7 @@ export function onStabilityDigestPublished(
  */
 export function onStabilityDigestPublished(
   opts: CrashlyticsOptions,
-  handler: (
-    event: CrashlyticsEvent<StabilityDigestPayload>
-  ) => any | Promise<any>
+  handler: (event: CrashlyticsEvent<StabilityDigestPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<StabilityDigestPayload>>;
 
 /**
@@ -497,15 +458,9 @@ export function onStabilityDigestPublished(
     | string
     | CrashlyticsOptions
     | ((event: CrashlyticsEvent<StabilityDigestPayload>) => any | Promise<any>),
-  handler?: (
-    event: CrashlyticsEvent<StabilityDigestPayload>
-  ) => any | Promise<any>
+  handler?: (event: CrashlyticsEvent<StabilityDigestPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<StabilityDigestPayload>> {
-  return onOperation<StabilityDigestPayload>(
-    stabilityDigestAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<StabilityDigestPayload>(stabilityDigestAlert, appIdOrOptsOrHandler, handler);
 }
 
 /**
@@ -550,15 +505,9 @@ export function onVelocityAlertPublished(
     | string
     | CrashlyticsOptions
     | ((event: CrashlyticsEvent<VelocityAlertPayload>) => any | Promise<any>),
-  handler?: (
-    event: CrashlyticsEvent<VelocityAlertPayload>
-  ) => any | Promise<any>
+  handler?: (event: CrashlyticsEvent<VelocityAlertPayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<VelocityAlertPayload>> {
-  return onOperation<VelocityAlertPayload>(
-    velocityAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<VelocityAlertPayload>(velocityAlert, appIdOrOptsOrHandler, handler);
 }
 
 /**
@@ -607,11 +556,7 @@ export function onNewAnrIssuePublished(
     | ((event: CrashlyticsEvent<NewAnrIssuePayload>) => any | Promise<any>),
   handler?: (event: CrashlyticsEvent<NewAnrIssuePayload>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<NewAnrIssuePayload>> {
-  return onOperation<NewAnrIssuePayload>(
-    newAnrIssueAlert,
-    appIdOrOptsOrHandler,
-    handler
-  );
+  return onOperation<NewAnrIssuePayload>(newAnrIssueAlert, appIdOrOptsOrHandler, handler);
 }
 
 /** @internal */
@@ -623,19 +568,15 @@ export function onOperation<T>(
     | ((event: CrashlyticsEvent<T>) => any | Promise<any>),
   handler: (event: CrashlyticsEvent<T>) => any | Promise<any>
 ): CloudFunction<CrashlyticsEvent<T>> {
-  if (typeof appIdOrOptsOrHandler === 'function') {
-    handler = appIdOrOptsOrHandler as (
-      event: CrashlyticsEvent<T>
-    ) => any | Promise<any>;
+  if (typeof appIdOrOptsOrHandler === "function") {
+    handler = appIdOrOptsOrHandler as (event: CrashlyticsEvent<T>) => any | Promise<any>;
     appIdOrOptsOrHandler = {};
   }
 
-  const [opts, appId] = getOptsAndApp(
-    appIdOrOptsOrHandler as string | CrashlyticsOptions
-  );
+  const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler);
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(convertAlertAndApp(raw) as CrashlyticsEvent<T>);
+    return wrapTraceContext(handler(convertAlertAndApp(raw) as CrashlyticsEvent<T>));
   };
 
   func.run = handler;
@@ -653,7 +594,7 @@ export function getOptsAndApp(
 ): [options.EventHandlerOptions, string | undefined] {
   let opts: options.EventHandlerOptions;
   let appId: string | undefined;
-  if (typeof appIdOrOpts === 'string') {
+  if (typeof appIdOrOpts === "string") {
     opts = {};
     appId = appIdOrOpts;
   } else {
diff --git a/src/v2/providers/alerts/index.ts b/src/v2/providers/alerts/index.ts
index e0988f5b8..b17f66dcb 100644
--- a/src/v2/providers/alerts/index.ts
+++ b/src/v2/providers/alerts/index.ts
@@ -27,10 +27,10 @@
  * @packageDocumentation
  */
 
-import * as appDistribution from './appDistribution';
-import * as billing from './billing';
-import * as crashlytics from './crashlytics';
-import * as performance from './performance';
+import * as appDistribution from "./appDistribution";
+import * as billing from "./billing";
+import * as crashlytics from "./crashlytics";
+import * as performance from "./performance";
 
 export { appDistribution, billing, crashlytics, performance };
-export * from './alerts';
+export * from "./alerts";
diff --git a/src/v2/providers/alerts/performance.ts b/src/v2/providers/alerts/performance.ts
index ef0a5f5e0..56912d596 100644
--- a/src/v2/providers/alerts/performance.ts
+++ b/src/v2/providers/alerts/performance.ts
@@ -25,13 +25,9 @@
  * @packageDocumentation
  */
 
-import { CloudEvent, CloudFunction } from '../../core';
-import { EventHandlerOptions } from '../../options';
-import {
-  convertAlertAndApp,
-  FirebaseAlertData,
-  getEndpointAnnotation,
-} from './alerts';
+import { CloudEvent, CloudFunction } from "../../core";
+import { EventHandlerOptions } from "../../options";
+import { convertAlertAndApp, FirebaseAlertData, getEndpointAnnotation } from "./alerts";
 
 /**
  * The internal payload object for a performance threshold alert.
@@ -74,7 +70,7 @@ export interface PerformanceEvent<T> extends CloudEvent<FirebaseAlertData<T>> {
 }
 
 /** @internal */
-export const thresholdAlert = 'performance.threshold';
+export const thresholdAlert = "performance.threshold";
 
 /**
  * Configuration for app distribution functions.
@@ -90,9 +86,7 @@ export interface PerformanceOptions extends EventHandlerOptions {
  * @returns A function that you can export and deploy.
  */
 export function onThresholdAlertPublished(
-  handler: (
-    event: PerformanceEvent<ThresholdAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: PerformanceEvent<ThresholdAlertPayload>) => any | Promise<any>
 ): CloudFunction<PerformanceEvent<ThresholdAlertPayload>>;
 
 /**
@@ -103,9 +97,7 @@ export function onThresholdAlertPublished(
  */
 export function onThresholdAlertPublished(
   appId: string,
-  handler: (
-    event: PerformanceEvent<ThresholdAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: PerformanceEvent<ThresholdAlertPayload>) => any | Promise<any>
 ): CloudFunction<PerformanceEvent<ThresholdAlertPayload>>;
 
 /**
@@ -116,9 +108,7 @@ export function onThresholdAlertPublished(
  */
 export function onThresholdAlertPublished(
   opts: PerformanceOptions,
-  handler: (
-    event: PerformanceEvent<ThresholdAlertPayload>
-  ) => any | Promise<any>
+  handler: (event: PerformanceEvent<ThresholdAlertPayload>) => any | Promise<any>
 ): CloudFunction<PerformanceEvent<ThresholdAlertPayload>>;
 
 /**
@@ -132,11 +122,9 @@ export function onThresholdAlertPublished(
     | string
     | PerformanceOptions
     | ((event: PerformanceEvent<ThresholdAlertPayload>) => any | Promise<any>),
-  handler?: (
-    event: PerformanceEvent<ThresholdAlertPayload>
-  ) => any | Promise<any>
+  handler?: (event: PerformanceEvent<ThresholdAlertPayload>) => any | Promise<any>
 ): CloudFunction<PerformanceEvent<ThresholdAlertPayload>> {
-  if (typeof appIdOrOptsOrHandler === 'function') {
+  if (typeof appIdOrOptsOrHandler === "function") {
     handler = appIdOrOptsOrHandler as (
       event: PerformanceEvent<ThresholdAlertPayload>
     ) => any | Promise<any>;
@@ -146,9 +134,7 @@ export function onThresholdAlertPublished(
   const [opts, appId] = getOptsAndApp(appIdOrOptsOrHandler);
 
   const func = (raw: CloudEvent<unknown>) => {
-    const event = convertAlertAndApp(raw) as PerformanceEvent<
-      ThresholdAlertPayload
-    >;
+    const event = convertAlertAndApp(raw) as PerformanceEvent<ThresholdAlertPayload>;
     const convertedPayload = convertPayload(event.data.payload);
     event.data.payload = convertedPayload;
     return handler(event);
@@ -167,7 +153,7 @@ export function onThresholdAlertPublished(
 export function getOptsAndApp(
   appIdOrOpts: string | PerformanceOptions
 ): [EventHandlerOptions, string | undefined] {
-  if (typeof appIdOrOpts === 'string') {
+  if (typeof appIdOrOpts === "string") {
     return [{}, appIdOrOpts];
   }
 
@@ -182,20 +168,12 @@ export function getOptsAndApp(
  * Helper function to convert the raw payload of a {@link PerformanceEvent} to a {@link ThresholdAlertPayload}
  * @internal
  */
-export function convertPayload(
-  raw: ThresholdAlertPayload
-): ThresholdAlertPayload {
+export function convertPayload(raw: ThresholdAlertPayload): ThresholdAlertPayload {
   const payload: ThresholdAlertPayload = { ...raw };
-  if (
-    typeof payload.conditionPercentile !== 'undefined' &&
-    payload.conditionPercentile === 0
-  ) {
+  if (typeof payload.conditionPercentile !== "undefined" && payload.conditionPercentile === 0) {
     delete (payload as any).conditionPercentile;
   }
-  if (
-    typeof payload.appVersion !== 'undefined' &&
-    payload.appVersion.length === 0
-  ) {
+  if (typeof payload.appVersion !== "undefined" && payload.appVersion.length === 0) {
     delete (payload as any).appVersion;
   }
 
diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts
index 2f3127dff..af9ced565 100644
--- a/src/v2/providers/database.ts
+++ b/src/v2/providers/database.ts
@@ -20,34 +20,38 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { apps } from '../../apps';
-import { Change } from '../../common/change';
-import { DataSnapshot } from '../../common/providers/database';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import { normalizePath } from '../../utilities/path';
-import { PathPattern } from '../../utilities/path-pattern';
-import { applyChange } from '../../utils';
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { getApp } from "../../common/app";
+import { Change } from "../../common/change";
+import { ParamsOf } from "../../common/params";
+import { ResetValue } from "../../common/options";
+import { DataSnapshot } from "../../common/providers/database";
+import { normalizePath } from "../../common/utilities/path";
+import { PathPattern } from "../../common/utilities/path-pattern";
+import { applyChange } from "../../common/utilities/utils";
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { Expression } from "../../params";
+import { wrapTraceContext } from "../trace";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 
 export { DataSnapshot };
 
 /** @internal */
-export const writtenEventType = 'google.firebase.database.ref.v1.written';
+export const writtenEventType = "google.firebase.database.ref.v1.written";
 
 /** @internal */
-export const createdEventType = 'google.firebase.database.ref.v1.created';
+export const createdEventType = "google.firebase.database.ref.v1.created";
 
 /** @internal */
-export const updatedEventType = 'google.firebase.database.ref.v1.updated';
+export const updatedEventType = "google.firebase.database.ref.v1.updated";
 
 /** @internal */
-export const deletedEventType = 'google.firebase.database.ref.v1.deleted';
+export const deletedEventType = "google.firebase.database.ref.v1.deleted";
 
 /** @hidden */
 export interface RawRTDBCloudEventData {
-  ['@type']: 'type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData';
+  ["@type"]: "type.googleapis.com/google.events.firebase.database.v1.ReferenceEventData";
   data: any;
   delta: any;
 }
@@ -61,7 +65,7 @@ export interface RawRTDBCloudEvent extends CloudEvent<RawRTDBCloudEventData> {
 }
 
 /** A CloudEvent that contains a DataSnapshot or a Change<DataSnapshot> */
-export interface DatabaseEvent<T> extends CloudEvent<T> {
+export interface DatabaseEvent<T, Params = Record<string, string>> extends CloudEvent<T> {
   /** The domain of the database instance */
   firebaseDatabaseHost: string;
   /** The instance ID portion of the fully qualified resource name */
@@ -74,17 +78,17 @@ export interface DatabaseEvent<T> extends CloudEvent<T> {
    * An object containing the values of the path patterns.
    * Only named capture groups will be populated - {key}, {key=*}, {key=**}
    */
-  params: Record<string, string>;
+  params: Params;
 }
 
 /** ReferenceOptions extend EventHandlerOptions with provided ref and optional instance  */
-export interface ReferenceOptions extends options.EventHandlerOptions {
+export interface ReferenceOptions<Ref extends string = string> extends options.EventHandlerOptions {
   /**
    * Specify the handler to trigger on a database reference(s).
    * This value can either be a single reference or a pattern.
    * Examples: '/foo/bar', '/foo/{bar}'
    */
-  ref: string;
+  ref: Ref;
 
   /**
    * Specify the handler to trigger on a database instance(s).
@@ -101,78 +105,78 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -182,10 +186,10 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean | Expression<boolean> | null;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -194,10 +198,10 @@ export interface ReferenceOptions extends options.EventHandlerOptions {
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs.
  */
-export function onValueWritten(
-  reference: string,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export function onValueWritten<Ref extends string>(
+  ref: Ref,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is created, updated, or deleted in Realtime Database.
@@ -205,10 +209,10 @@ export function onValueWritten(
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs.
  */
-export function onValueWritten(
-  opts: ReferenceOptions,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export function onValueWritten<Ref extends string>(
+  opts: ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is created, updated, or deleted in Realtime Database.
@@ -216,10 +220,10 @@ export function onValueWritten(
  * @param referenceOrOpts - Options or a string reference.
  * @param handler - Event handler which is run every time a Realtime Database create, update, or delete occurs.
  */
-export function onValueWritten(
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>> {
+export function onValueWritten<Ref extends string>(
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>> {
   return onChangedOperation(writtenEventType, referenceOrOpts, handler);
 }
 
@@ -229,10 +233,10 @@ export function onValueWritten(
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database create occurs.
  */
-export function onValueCreated(
-  reference: string,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export function onValueCreated<Ref extends string>(
+  ref: Ref,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is created in Realtime Database.
@@ -240,10 +244,10 @@ export function onValueCreated(
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database create occurs.
  */
-export function onValueCreated(
-  opts: ReferenceOptions,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export function onValueCreated<Ref extends string>(
+  opts: ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is created in Realtime Database.
@@ -251,10 +255,10 @@ export function onValueCreated(
  * @param referenceOrOpts - Options or a string reference.
  * @param handler - Event handler which is run every time a Realtime Database create occurs.
  */
-export function onValueCreated(
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>> {
+export function onValueCreated<Ref extends string>(
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>> {
   return onOperation(createdEventType, referenceOrOpts, handler);
 }
 
@@ -264,10 +268,10 @@ export function onValueCreated(
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database update occurs.
  */
-export function onValueUpdated(
-  reference: string,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export function onValueUpdated<Ref extends string>(
+  ref: Ref,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is updated in Realtime Database.
@@ -275,10 +279,10 @@ export function onValueUpdated(
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database update occurs.
  */
-export function onValueUpdated(
-  opts: ReferenceOptions,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>>;
+export function onValueUpdated<Ref extends string>(
+  opts: ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is updated in Realtime Database.
@@ -286,10 +290,10 @@ export function onValueUpdated(
  * @param referenceOrOpts - Options or a string reference.
  * @param handler - Event handler which is run every time a Realtime Database update occurs.
  */
-export function onValueUpdated(
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>> {
+export function onValueUpdated<Ref extends string>(
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>> {
   return onChangedOperation(updatedEventType, referenceOrOpts, handler);
 }
 
@@ -299,10 +303,10 @@ export function onValueUpdated(
  * @param reference - The database reference path to trigger on.
  * @param handler - Event handler which is run every time a Realtime Database deletion occurs.
  */
-export function onValueDeleted(
-  reference: string,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export function onValueDeleted<Ref extends string>(
+  ref: Ref,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is deleted in Realtime Database.
@@ -310,10 +314,10 @@ export function onValueDeleted(
  * @param opts - Options that can be set on an individual event-handling function.
  * @param handler - Event handler which is run every time a Realtime Database deletion occurs.
  */
-export function onValueDeleted(
-  opts: ReferenceOptions,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>>;
+export function onValueDeleted<Ref extends string>(
+  opts: ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>>;
 
 /**
  * Event handler which triggers when data is deleted in Realtime Database.
@@ -321,24 +325,26 @@ export function onValueDeleted(
  * @param referenceOrOpts - Options or a string reference.
  * @param handler - Event handler which is run every time a Realtime Database deletion occurs.
  */
-export function onValueDeleted(
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>> {
+export function onValueDeleted<Ref extends string>(
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>> {
   // TODO - need to use event.data.delta
   return onOperation(deletedEventType, referenceOrOpts, handler);
 }
 
 /** @internal */
 export function getOpts(referenceOrOpts: string | ReferenceOptions) {
-  let path: string, instance: string, opts: options.EventHandlerOptions;
-  if (typeof referenceOrOpts === 'string') {
+  let path: string;
+  let instance: string;
+  let opts: options.EventHandlerOptions;
+  if (typeof referenceOrOpts === "string") {
     path = normalizePath(referenceOrOpts);
-    instance = '*';
+    instance = "*";
     opts = {};
   } else {
     path = normalizePath(referenceOrOpts.ref);
-    instance = referenceOrOpts.instance || '*';
+    instance = referenceOrOpts.instance || "*";
     opts = { ...referenceOrOpts };
     delete (opts as any).ref;
     delete (opts as any).instance;
@@ -352,11 +358,7 @@ export function getOpts(referenceOrOpts: string | ReferenceOptions) {
 }
 
 /** @internal */
-export function makeParams(
-  event: RawRTDBCloudEvent,
-  path: PathPattern,
-  instance: PathPattern
-) {
+export function makeParams(event: RawRTDBCloudEvent, path: PathPattern, instance: PathPattern) {
   return {
     ...path.extractMatches(event.ref),
     ...instance.extractMatches(event.instance),
@@ -364,14 +366,14 @@ export function makeParams(
 }
 
 /** @hidden */
-function makeDatabaseEvent(
+function makeDatabaseEvent<Params>(
   event: RawRTDBCloudEvent,
   data: any,
   instance: string,
-  params: Record<string, string>
-): DatabaseEvent<DataSnapshot> {
-  const snapshot = new DataSnapshot(data, event.ref, apps().admin, instance);
-  const databaseEvent: DatabaseEvent<DataSnapshot> = {
+  params: Params
+): DatabaseEvent<DataSnapshot, Params> {
+  const snapshot = new DataSnapshot(data, event.ref, getApp(), instance);
+  const databaseEvent: DatabaseEvent<DataSnapshot, Params> = {
     ...event,
     firebaseDatabaseHost: event.firebasedatabasehost,
     data: snapshot,
@@ -382,24 +384,19 @@ function makeDatabaseEvent(
 }
 
 /** @hidden */
-function makeChangedDatabaseEvent(
+function makeChangedDatabaseEvent<Params>(
   event: RawRTDBCloudEvent,
   instance: string,
-  params: Record<string, string>
-): DatabaseEvent<Change<DataSnapshot>> {
-  const before = new DataSnapshot(
-    event.data.data,
-    event.ref,
-    apps().admin,
-    instance
-  );
+  params: Params
+): DatabaseEvent<Change<DataSnapshot>, Params> {
+  const before = new DataSnapshot(event.data.data, event.ref, getApp(), instance);
   const after = new DataSnapshot(
     applyChange(event.data.data, event.data.delta),
     event.ref,
-    apps().admin,
+    getApp(),
     instance
   );
-  const databaseEvent: DatabaseEvent<Change<DataSnapshot>> = {
+  const databaseEvent: DatabaseEvent<Change<DataSnapshot>, Params> = {
     ...event,
     firebaseDatabaseHost: event.firebasedatabasehost,
     data: {
@@ -432,7 +429,8 @@ export function makeEndpoint(
     : (eventFilters.instance = instance.getValue());
 
   return {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
@@ -449,11 +447,11 @@ export function makeEndpoint(
 }
 
 /** @internal */
-export function onChangedOperation(
+export function onChangedOperation<Ref extends string>(
   eventType: string,
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<Change<DataSnapshot>>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<Change<DataSnapshot>>> {
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<Change<DataSnapshot>, ParamsOf<Ref>>> {
   const { path, instance, opts } = getOpts(referenceOrOpts);
 
   const pathPattern = new PathPattern(path);
@@ -463,9 +461,9 @@ export function onChangedOperation(
   const func = (raw: CloudEvent<unknown>) => {
     const event = raw as RawRTDBCloudEvent;
     const instanceUrl = `https://${event.instance}.${event.firebasedatabasehost}`;
-    const params = makeParams(event, pathPattern, instancePattern);
+    const params = makeParams(event, pathPattern, instancePattern) as unknown as ParamsOf<Ref>;
     const databaseEvent = makeChangedDatabaseEvent(event, instanceUrl, params);
-    return handler(databaseEvent);
+    return wrapTraceContext(handler)(databaseEvent);
   };
 
   func.run = handler;
@@ -476,11 +474,11 @@ export function onChangedOperation(
 }
 
 /** @internal */
-export function onOperation(
+export function onOperation<Ref extends string>(
   eventType: string,
-  referenceOrOpts: string | ReferenceOptions,
-  handler: (event: DatabaseEvent<DataSnapshot>) => any | Promise<any>
-): CloudFunction<DatabaseEvent<DataSnapshot>> {
+  referenceOrOpts: Ref | ReferenceOptions<Ref>,
+  handler: (event: DatabaseEvent<DataSnapshot, ParamsOf<Ref>>) => any | Promise<any>
+): CloudFunction<DatabaseEvent<DataSnapshot, ParamsOf<Ref>>> {
   const { path, instance, opts } = getOpts(referenceOrOpts);
 
   const pathPattern = new PathPattern(path);
@@ -490,9 +488,8 @@ export function onOperation(
   const func = (raw: CloudEvent<unknown>) => {
     const event = raw as RawRTDBCloudEvent;
     const instanceUrl = `https://${event.instance}.${event.firebasedatabasehost}`;
-    const params = makeParams(event, pathPattern, instancePattern);
-    const data =
-      eventType === deletedEventType ? event.data.data : event.data.delta;
+    const params = makeParams(event, pathPattern, instancePattern) as unknown as ParamsOf<Ref>;
+    const data = eventType === deletedEventType ? event.data.data : event.data.delta;
     const databaseEvent = makeDatabaseEvent(event, data, instanceUrl, params);
     return handler(databaseEvent);
   };
diff --git a/src/v2/providers/eventarc.ts b/src/v2/providers/eventarc.ts
index 71e4b0174..4f425faef 100644
--- a/src/v2/providers/eventarc.ts
+++ b/src/v2/providers/eventarc.ts
@@ -25,11 +25,14 @@
  * @packageDocumentation
  */
 
-import { convertIfPresent, copyIfPresent } from '../../common/encoding';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { convertIfPresent, copyIfPresent } from "../../common/encoding";
+import { ResetValue } from "../../common/options";
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { wrapTraceContext } from "../trace";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 
 /** Options that can be set on an Eventarc trigger. */
 export interface EventarcTriggerOptions extends options.EventHandlerOptions {
@@ -66,78 +69,78 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -147,10 +150,10 @@ export interface EventarcTriggerOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /** Handles an Eventarc event published on the default channel.
@@ -178,26 +181,27 @@ export function onCustomEventPublished<T = any>(
   handler: (event: CloudEvent<T>) => any | Promise<any>
 ): CloudFunction<CloudEvent<T>> {
   let opts: EventarcTriggerOptions;
-  if (typeof eventTypeOrOpts === 'string') {
+  if (typeof eventTypeOrOpts === "string") {
     opts = {
-      eventType: eventTypeOrOpts as string,
+      eventType: eventTypeOrOpts,
     };
-  } else if (typeof eventTypeOrOpts === 'object') {
-    opts = eventTypeOrOpts as EventarcTriggerOptions;
+  } else if (typeof eventTypeOrOpts === "object") {
+    opts = eventTypeOrOpts;
   }
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(raw as CloudEvent<T>);
+    return wrapTraceContext(handler)(raw as CloudEvent<T>);
   };
 
   func.run = handler;
 
-  const channel = opts.channel ?? 'locations/us-central1/channels/firebase';
+  const channel = opts.channel ?? "locations/us-central1/channels/firebase";
 
   const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
   const specificOpts = options.optionsToEndpoint(opts);
 
   const endpoint: ManifestEndpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
@@ -211,8 +215,8 @@ export function onCustomEventPublished<T = any>(
       channel,
     },
   };
-  convertIfPresent(endpoint.eventTrigger, opts, 'eventFilters', 'filters');
-  copyIfPresent(endpoint.eventTrigger, opts, 'retry');
+  convertIfPresent(endpoint.eventTrigger, opts, "eventFilters", "filters");
+  copyIfPresent(endpoint.eventTrigger, opts, "retry");
 
   func.__endpoint = endpoint;
 
diff --git a/src/v2/providers/https.ts b/src/v2/providers/https.ts
index 0ab9c531c..0bbc43d18 100644
--- a/src/v2/providers/https.ts
+++ b/src/v2/providers/https.ts
@@ -25,31 +25,34 @@
  * @packageDocumentation
  */
 
-import * as cors from 'cors';
-import * as express from 'express';
-import { convertIfPresent, convertInvoker } from '../../common/encoding';
-
-import { isDebugFeatureEnabled } from '../../common/debug';
+import * as cors from "cors";
+import * as express from "express";
+import { convertIfPresent, convertInvoker } from "../../common/encoding";
+import { wrapTraceContext } from "../trace";
+import { isDebugFeatureEnabled } from "../../common/debug";
+import { ResetValue } from "../../common/options";
 import {
   CallableRequest,
   FunctionsErrorCode,
   HttpsError,
   onCallHandler,
   Request,
-} from '../../common/providers/https';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import * as options from '../options';
-import { GlobalOptions, SupportedRegion } from '../options';
-import { Expression } from '../params';
+} from "../../common/providers/https";
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { GlobalOptions, SupportedRegion } from "../options";
+import { Expression } from "../../params";
+import { SecretParam } from "../../params/types";
+import * as options from "../options";
 
 export { Request, CallableRequest, FunctionsErrorCode, HttpsError };
 
 /**
- * Options that can be set on an individual HTTPS function.
+ * Options that can be set on an onRequest HTTPS function.
  */
-export interface HttpsOptions extends Omit<GlobalOptions, 'region'> {
+export interface HttpsOptions extends Omit<GlobalOptions, "region"> {
   /** HTTP functions can override global options and can specify multiple regions to deploy to. */
   region?: SupportedRegion | string | Array<SupportedRegion | string>;
+
   /** If true, allows CORS on requests to this function.
    * If this is a `string` or `RegExp`, allows requests from domains that match the provided value.
    * If this is an `Array`, allows requests from domains matching at least one entry of the array.
@@ -59,96 +62,106 @@ export interface HttpsOptions extends Omit<GlobalOptions, 'region'> {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
    */
   labels?: Record<string, string>;
 
+  /*
+   * Secrets to bind to a function.
+   */
+  secrets?: (string | SecretParam)[];
+
   /**
    * Invoker to set access control on https functions.
    */
-  invoker?: 'public' | 'private' | string | string[];
+  invoker?: "public" | "private" | string | string[];
+}
 
-  /*
-   * Secrets to bind to a function.
+/**
+ * Options that can be set on a callable HTTPS function.
+ */
+export interface CallableOptions extends HttpsOptions {
+  /**
+   * Determines whether Firebase AppCheck is enforced.
+   * When true, requests with invalid tokens autorespond with a 401
+   * (Unauthorized) error.
+   * When false, requests with invalid tokens set event.app to undefiend.
    */
-  secrets?: string[];
-
-  /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  enforceAppCheck?: boolean;
 }
 
 /**
@@ -160,8 +173,6 @@ export type HttpsFunction = ((
   /** An Express response object, for this function to respond to callers. */
   res: express.Response
 ) => void | Promise<void>) & {
-  /** @alpha */
-  __trigger?: unknown;
   /** @alpha */
   __endpoint: ManifestEndpoint;
 };
@@ -184,10 +195,7 @@ export interface CallableFunction<T, Return> extends HttpsFunction {
  */
 export function onRequest(
   opts: HttpsOptions,
-  handler: (
-    request: Request,
-    response: express.Response
-  ) => void | Promise<void>
+  handler: (request: Request, response: express.Response) => void | Promise<void>
 ): HttpsFunction;
 /**
  * Handles HTTPS requests.
@@ -195,19 +203,13 @@ export function onRequest(
  * @returns A function that you can export and deploy.
  */
 export function onRequest(
-  handler: (
-    request: Request,
-    response: express.Response
-  ) => void | Promise<void>
+  handler: (request: Request, response: express.Response) => void | Promise<void>
 ): HttpsFunction;
 export function onRequest(
   optsOrHandler:
     | HttpsOptions
     | ((request: Request, response: express.Response) => void | Promise<void>),
-  handler?: (
-    request: Request,
-    response: express.Response
-  ) => void | Promise<void>
+  handler?: (request: Request, response: express.Response) => void | Promise<void>
 ): HttpsFunction {
   let opts: HttpsOptions;
   if (arguments.length === 1) {
@@ -220,12 +222,12 @@ export function onRequest(
     opts = optsOrHandler as HttpsOptions;
   }
 
-  if (isDebugFeatureEnabled('enableCors') || 'cors' in opts) {
-    const origin = isDebugFeatureEnabled('enableCors') ? true : opts.cors;
+  if (isDebugFeatureEnabled("enableCors") || "cors" in opts) {
+    const origin = isDebugFeatureEnabled("enableCors") ? true : opts.cors;
     const userProvidedHandler = handler;
     handler = (req: Request, res: express.Response): void | Promise<void> => {
       return new Promise((resolve) => {
-        res.on('finish', resolve);
+        res.on("finish", resolve);
         cors({ origin })(req, res, () => {
           resolve(userProvidedHandler(req, res));
         });
@@ -233,45 +235,15 @@ export function onRequest(
     };
   }
 
-  Object.defineProperty(handler, '__trigger', {
-    get: () => {
-      const baseOpts = options.optionsToTriggerAnnotations(
-        options.getGlobalOptions()
-      );
-      // global options calls region a scalar and https allows it to be an array,
-      // but optionsToTriggerAnnotations handles both cases.
-      const specificOpts = options.optionsToTriggerAnnotations(
-        opts as options.GlobalOptions
-      );
-      const trigger: any = {
-        platform: 'gcfv2',
-        ...baseOpts,
-        ...specificOpts,
-        labels: {
-          ...baseOpts?.labels,
-          ...specificOpts?.labels,
-        },
-        httpsTrigger: {
-          allowInsecure: false,
-        },
-      };
-      convertIfPresent(
-        trigger.httpsTrigger,
-        opts,
-        'invoker',
-        'invoker',
-        convertInvoker
-      );
-      return trigger;
-    },
-  });
+  handler = wrapTraceContext(handler);
 
   const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
   // global options calls region a scalar and https allows it to be an array,
   // but optionsToTriggerAnnotations handles both cases.
   const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions);
   const endpoint: Partial<ManifestEndpoint> = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
@@ -280,13 +252,7 @@ export function onRequest(
     },
     httpsTrigger: {},
   };
-  convertIfPresent(
-    endpoint.httpsTrigger,
-    opts,
-    'invoker',
-    'invoker',
-    convertInvoker
-  );
+  convertIfPresent(endpoint.httpsTrigger, opts, "invoker", "invoker", convertInvoker);
   (handler as HttpsFunction).__endpoint = endpoint;
 
   return handler as HttpsFunction;
@@ -299,7 +265,7 @@ export function onRequest(
  * @returns A function that you can export and deploy.
  */
 export function onCall<T = any, Return = any | Promise<any>>(
-  opts: HttpsOptions,
+  opts: CallableOptions,
   handler: (request: CallableRequest<T>) => Return
 ): CallableFunction<T, Return>;
 /**
@@ -311,61 +277,37 @@ export function onCall<T = any, Return = any | Promise<any>>(
   handler: (request: CallableRequest<T>) => Return
 ): CallableFunction<T, Return>;
 export function onCall<T = any, Return = any | Promise<any>>(
-  optsOrHandler: HttpsOptions | ((request: CallableRequest<T>) => Return),
+  optsOrHandler: CallableOptions | ((request: CallableRequest<T>) => Return),
   handler?: (request: CallableRequest<T>) => Return
 ): CallableFunction<T, Return> {
-  let opts: HttpsOptions;
-  if (arguments.length == 1) {
+  let opts: CallableOptions;
+  if (arguments.length === 1) {
     opts = {};
     handler = optsOrHandler as (request: CallableRequest<T>) => Return;
   } else {
-    opts = optsOrHandler as HttpsOptions;
+    opts = optsOrHandler as CallableOptions;
   }
 
-  const origin = isDebugFeatureEnabled('enableCors')
-    ? true
-    : 'cors' in opts
-    ? opts.cors
-    : true;
+  const origin = isDebugFeatureEnabled("enableCors") ? true : "cors" in opts ? opts.cors : true;
 
   // onCallHandler sniffs the function length to determine which API to present.
   // fix the length to prevent api versions from being mismatched.
   const fixedLen = (req: CallableRequest<T>) => handler(req);
   const func: any = onCallHandler(
-    { cors: { origin, methods: 'POST' } },
+    {
+      cors: { origin, methods: "POST" },
+      enforceAppCheck: opts.enforceAppCheck ?? options.getGlobalOptions().enforceAppCheck,
+    },
     fixedLen
   );
 
-  Object.defineProperty(func, '__trigger', {
-    get: () => {
-      const baseOpts = options.optionsToTriggerAnnotations(
-        options.getGlobalOptions()
-      );
-      // global options calls region a scalar and https allows it to be an array,
-      // but optionsToTriggerAnnotations handles both cases.
-      const specificOpts = options.optionsToTriggerAnnotations(opts);
-      return {
-        platform: 'gcfv2',
-        ...baseOpts,
-        ...specificOpts,
-        labels: {
-          ...baseOpts?.labels,
-          ...specificOpts?.labels,
-          'deployment-callable': 'true',
-        },
-        httpsTrigger: {
-          allowInsecure: false,
-        },
-      };
-    },
-  });
-
   const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
   // global options calls region a scalar and https allows it to be an array,
   // but optionsToEndpoint handles both cases.
   const specificOpts = options.optionsToEndpoint(opts);
   func.__endpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
diff --git a/src/v2/providers/identity.ts b/src/v2/providers/identity.ts
index ed823dd0f..a1a29a252 100644
--- a/src/v2/providers/identity.ts
+++ b/src/v2/providers/identity.ts
@@ -24,8 +24,7 @@
  * Cloud functions to handle events from Google Cloud Identity Platform.
  * @packageDocumentation
  */
-
-import { BlockingFunction } from '../../cloud-functions';
+import { ResetValue } from "../../common/options";
 import {
   AuthBlockingEvent,
   AuthBlockingEventType,
@@ -34,9 +33,13 @@ import {
   BeforeSignInResponse,
   HttpsError,
   wrapHandler,
-} from '../../common/providers/identity';
-import * as options from '../options';
-import { Expression } from '../params';
+} from "../../common/providers/identity";
+import { BlockingFunction } from "../../v1/cloud-functions";
+import { wrapTraceContext } from "../trace";
+import { Expression } from "../../params";
+import { initV2Endpoint } from "../../runtime/manifest";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 
 export { AuthUserRecord, AuthBlockingEvent, HttpsError };
 
@@ -68,78 +71,78 @@ export interface BlockingOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -149,7 +152,7 @@ export interface BlockingOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 }
 
 /**
@@ -159,11 +162,7 @@ export interface BlockingOptions {
 export function beforeUserCreated(
   handler: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeCreateResponse
-    | Promise<BeforeCreateResponse>
-    | void
-    | Promise<void>
+  ) => BeforeCreateResponse | Promise<BeforeCreateResponse> | void | Promise<void>
 ): BlockingFunction;
 
 /**
@@ -175,11 +174,7 @@ export function beforeUserCreated(
   opts: BlockingOptions,
   handler: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeCreateResponse
-    | Promise<BeforeCreateResponse>
-    | void
-    | Promise<void>
+  ) => BeforeCreateResponse | Promise<BeforeCreateResponse> | void | Promise<void>
 ): BlockingFunction;
 
 /**
@@ -192,20 +187,12 @@ export function beforeUserCreated(
     | BlockingOptions
     | ((
         event: AuthBlockingEvent
-      ) =>
-        | BeforeCreateResponse
-        | Promise<BeforeCreateResponse>
-        | void
-        | Promise<void>),
+      ) => BeforeCreateResponse | Promise<BeforeCreateResponse> | void | Promise<void>),
   handler?: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeCreateResponse
-    | Promise<BeforeCreateResponse>
-    | void
-    | Promise<void>
+  ) => BeforeCreateResponse | Promise<BeforeCreateResponse> | void | Promise<void>
 ): BlockingFunction {
-  return beforeOperation('beforeCreate', optsOrHandler, handler);
+  return beforeOperation("beforeCreate", optsOrHandler, handler);
 }
 
 /**
@@ -215,11 +202,7 @@ export function beforeUserCreated(
 export function beforeUserSignedIn(
   handler: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeSignInResponse
-    | Promise<BeforeSignInResponse>
-    | void
-    | Promise<void>
+  ) => BeforeSignInResponse | Promise<BeforeSignInResponse> | void | Promise<void>
 ): BlockingFunction;
 
 /**
@@ -231,11 +214,7 @@ export function beforeUserSignedIn(
   opts: BlockingOptions,
   handler: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeSignInResponse
-    | Promise<BeforeSignInResponse>
-    | void
-    | Promise<void>
+  ) => BeforeSignInResponse | Promise<BeforeSignInResponse> | void | Promise<void>
 ): BlockingFunction;
 
 /**
@@ -248,20 +227,12 @@ export function beforeUserSignedIn(
     | BlockingOptions
     | ((
         event: AuthBlockingEvent
-      ) =>
-        | BeforeSignInResponse
-        | Promise<BeforeSignInResponse>
-        | void
-        | Promise<void>),
+      ) => BeforeSignInResponse | Promise<BeforeSignInResponse> | void | Promise<void>),
   handler?: (
     event: AuthBlockingEvent
-  ) =>
-    | BeforeSignInResponse
-    | Promise<BeforeSignInResponse>
-    | void
-    | Promise<void>
+  ) => BeforeSignInResponse | Promise<BeforeSignInResponse> | void | Promise<void>
 ): BlockingFunction {
-  return beforeOperation('beforeSignIn', optsOrHandler, handler);
+  return beforeOperation("beforeSignIn", optsOrHandler, handler);
 }
 
 /** @hidden */
@@ -288,7 +259,7 @@ export function beforeOperation(
     | Promise<BeforeSignInResponse>
     | Promise<void>
 ): BlockingFunction {
-  if (!handler || typeof optsOrHandler === 'function') {
+  if (!handler || typeof optsOrHandler === "function") {
     handler = optsOrHandler as (
       event: AuthBlockingEvent
     ) =>
@@ -301,24 +272,21 @@ export function beforeOperation(
     optsOrHandler = {};
   }
 
-  const { opts, accessToken, idToken, refreshToken } = getOpts(
-    optsOrHandler as BlockingOptions
-  );
+  const { opts, accessToken, idToken, refreshToken } = getOpts(optsOrHandler);
 
   // Create our own function that just calls the provided function so we know for sure that
   // handler takes one argument. This is something common/providers/identity depends on.
   const wrappedHandler = (event: AuthBlockingEvent) => handler(event);
-  const func: any = wrapHandler(eventType, wrappedHandler);
+  const func: any = wrapTraceContext(wrapHandler(eventType, wrappedHandler));
 
   const legacyEventType = `providers/cloud.auth/eventTypes/user.${eventType}`;
 
   /** Endpoint */
-  const baseOptsEndpoint = options.optionsToEndpoint(
-    options.getGlobalOptions()
-  );
+  const baseOptsEndpoint = options.optionsToEndpoint(options.getGlobalOptions());
   const specificOptsEndpoint = options.optionsToEndpoint(opts);
   func.__endpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOptsEndpoint,
     ...specificOptsEndpoint,
     labels: {
@@ -337,8 +305,8 @@ export function beforeOperation(
 
   func.__requiredAPIs = [
     {
-      api: 'identitytoolkit.googleapis.com',
-      reason: 'Needed for auth blocking functions',
+      api: "identitytoolkit.googleapis.com",
+      reason: "Needed for auth blocking functions",
     },
   ];
 
diff --git a/src/v2/providers/pubsub.ts b/src/v2/providers/pubsub.ts
index 6f04f5cec..0be727adc 100644
--- a/src/v2/providers/pubsub.ts
+++ b/src/v2/providers/pubsub.ts
@@ -25,11 +25,14 @@
  * @packageDocumentation
  */
 
-import { copyIfPresent } from '../../common/encoding';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { copyIfPresent } from "../../common/encoding";
+import { ResetValue } from "../../common/options";
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { wrapTraceContext } from "../trace";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 
 /**
  * Google Cloud Pub/Sub is a globally distributed message bus that automatically scales as you need it.
@@ -95,7 +98,7 @@ export class Message<T> {
     this.messageId = data.messageId;
     this.data = data.data;
     this.attributes = data.attributes || {};
-    this.orderingKey = data.orderingKey || '';
+    this.orderingKey = data.orderingKey || "";
     this.publishTime = data.publishTime || new Date().toISOString();
     this._json = data.json;
   }
@@ -104,15 +107,11 @@ export class Message<T> {
    * The JSON data payload of this message object, if any.
    */
   get json(): T {
-    if (typeof this._json === 'undefined') {
+    if (typeof this._json === "undefined") {
       try {
-        this._json = JSON.parse(
-          Buffer.from(this.data, 'base64').toString('utf8')
-        );
+        this._json = JSON.parse(Buffer.from(this.data, "base64").toString("utf8"));
       } catch (err) {
-        throw new Error(
-          `Unable to parse Pub/Sub message data as JSON: ${err.message}`
-        );
+        throw new Error(`Unable to parse Pub/Sub message data as JSON: ${err.message}`);
       }
     }
 
@@ -163,78 +162,78 @@ export interface PubSubOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -244,10 +243,10 @@ export interface PubSubOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -284,7 +283,7 @@ export function onMessagePublished<T = any>(
 ): CloudFunction<CloudEvent<MessagePublishedData<T>>> {
   let topic: string;
   let opts: options.EventHandlerOptions;
-  if (typeof topicOrOptions === 'string') {
+  if (typeof topicOrOptions === "string") {
     topic = topicOrOptions;
     opts = {};
   } else {
@@ -299,39 +298,17 @@ export function onMessagePublished<T = any>(
       subscription: string;
     };
     messagePublishedData.message = new Message(messagePublishedData.message);
-    return handler(raw as CloudEvent<MessagePublishedData<T>>);
+    return wrapTraceContext(handler)(raw as CloudEvent<MessagePublishedData<T>>);
   };
 
   func.run = handler;
 
-  Object.defineProperty(func, '__trigger', {
-    get: () => {
-      const baseOpts = options.optionsToTriggerAnnotations(
-        options.getGlobalOptions()
-      );
-      const specificOpts = options.optionsToTriggerAnnotations(opts);
-
-      return {
-        platform: 'gcfv2',
-        ...baseOpts,
-        ...specificOpts,
-        labels: {
-          ...baseOpts?.labels,
-          ...specificOpts?.labels,
-        },
-        eventTrigger: {
-          eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
-          resource: `projects/${process.env.GCLOUD_PROJECT}/topics/${topic}`,
-        },
-      };
-    },
-  });
-
   const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
   const specificOpts = options.optionsToEndpoint(opts);
 
   const endpoint: ManifestEndpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
+    platform: "gcfv2",
     ...baseOpts,
     ...specificOpts,
     labels: {
@@ -339,12 +316,12 @@ export function onMessagePublished<T = any>(
       ...specificOpts?.labels,
     },
     eventTrigger: {
-      eventType: 'google.cloud.pubsub.topic.v1.messagePublished',
+      eventType: "google.cloud.pubsub.topic.v1.messagePublished",
       eventFilters: { topic },
       retry: false,
     },
   };
-  copyIfPresent(endpoint.eventTrigger, opts, 'retry', 'retry');
+  copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry");
   func.__endpoint = endpoint;
 
   return func;
diff --git a/src/v2/providers/remoteConfig.ts b/src/v2/providers/remoteConfig.ts
new file mode 100644
index 000000000..f6ff45172
--- /dev/null
+++ b/src/v2/providers/remoteConfig.ts
@@ -0,0 +1,154 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { EventHandlerOptions, getGlobalOptions, optionsToEndpoint } from "../options";
+
+/** @internal */
+export const eventType = "google.firebase.remoteconfig.remoteConfig.v1.updated";
+
+/** All the fields associated with the person/service account that wrote a Remote Config template. */
+export interface ConfigUser {
+  /** Display name. */
+  name: string;
+
+  /** Email address. */
+  email: string;
+
+  /** Image URL. */
+  imageUrl: string;
+}
+
+/** What type of update was associated with the Remote Config template version. */
+export type ConfigUpdateOrigin =
+  /** Catch-all for unrecognized values. */
+  | "REMOTE_CONFIG_UPDATE_ORIGIN_UNSPECIFIED"
+  /** The update came from the Firebase UI. */
+  | "CONSOLE"
+  /** The update came from the Remote Config REST API. */
+  | "REST_API"
+  /** The update came from the Firebase Admin Node SDK. */
+  | "ADMIN_SDK_NODE";
+
+/** Where the Remote Config update action originated. */
+export type ConfigUpdateType =
+  /** Catch-all for unrecognized enum values */
+  | "REMOTE_CONFIG_UPDATE_TYPE_UNSPECIFIED"
+  /** A regular incremental update */
+  | "INCREMENTAL_UPDATE"
+  /** A forced update. The ETag was specified as "*" in an UpdateRemoteConfigRequest request or the "Force Update" button was pressed on the console */
+  | "FORCED_UPDATE"
+  /** A rollback to a previous Remote Config template */
+  | "ROLLBACK";
+
+/** The data within Firebase Remote Config update events. */
+export interface ConfigUpdateData {
+  /** The version number of the version's corresponding Remote Config template. */
+  versionNumber: number;
+
+  /** When the Remote Config template was written to the Remote Config server. */
+  updateTime: string;
+
+  /** Aggregation of all metadata fields about the account that performed the update. */
+  updateUser: ConfigUser;
+
+  /** The user-provided description of the corresponding Remote Config template. */
+  description: string;
+
+  /** Where the update action originated. */
+  updateOrigin: ConfigUpdateOrigin;
+
+  /** What type of update was made. */
+  updateType: ConfigUpdateType;
+
+  /** Only present if this version is the result of a rollback, and will be the version number of the Remote Config template that was rolled-back to. */
+  rollbackSource: number;
+}
+
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+export function onConfigUpdated(
+  handler: (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>
+): CloudFunction<CloudEvent<ConfigUpdateData>>;
+
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param opts - Options that can be set on an individual event-handling function.
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+export function onConfigUpdated(
+  opts: EventHandlerOptions,
+  handler: (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>
+): CloudFunction<CloudEvent<ConfigUpdateData>>;
+
+/**
+ * Event handler which triggers when data is updated in a Remote Config.
+ *
+ * @param optsOrHandler - Options or an event handler.
+ * @param handler - Event handler which is run every time a Remote Config update occurs.
+ * @returns A function that you can export and deploy.
+ */
+export function onConfigUpdated(
+  optsOrHandler:
+    | EventHandlerOptions
+    | ((event: CloudEvent<ConfigUpdateData>) => any | Promise<any>),
+  handler?: (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>
+): CloudFunction<CloudEvent<ConfigUpdateData>> {
+  if (typeof optsOrHandler === "function") {
+    handler = optsOrHandler as (event: CloudEvent<ConfigUpdateData>) => any | Promise<any>;
+    optsOrHandler = {};
+  }
+
+  const baseOpts = optionsToEndpoint(getGlobalOptions());
+  const specificOpts = optionsToEndpoint(optsOrHandler);
+
+  const func: any = (raw: CloudEvent<unknown>) => {
+    return handler(raw as CloudEvent<ConfigUpdateData>);
+  };
+  func.run = handler;
+
+  const ep: ManifestEndpoint = {
+    ...initV2Endpoint(getGlobalOptions(), optsOrHandler),
+    platform: "gcfv2",
+    ...baseOpts,
+    ...specificOpts,
+    labels: {
+      ...baseOpts?.labels,
+      ...specificOpts?.labels,
+    },
+    eventTrigger: {
+      eventType,
+      eventFilters: {},
+      retry: !!optsOrHandler.retry,
+    },
+  };
+  func.__endpoint = ep;
+
+  return func;
+}
diff --git a/src/v2/providers/scheduler.ts b/src/v2/providers/scheduler.ts
index 4c181ed11..ec17e10e5 100644
--- a/src/v2/providers/scheduler.ts
+++ b/src/v2/providers/scheduler.ts
@@ -20,29 +20,38 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as express from 'express';
-import { copyIfPresent } from '../../common/encoding';
-import { timezone } from '../../common/timezone';
-import * as logger from '../../logger';
-import { ManifestEndpoint, ManifestRequiredAPI } from '../../runtime/manifest';
-import * as options from '../options';
-import { HttpsFunction } from './https';
+import * as express from "express";
+
+import { copyIfPresent } from "../../common/encoding";
+import { ResetValue } from "../../common/options";
+import { timezone } from "../../common/timezone";
+import {
+  initV2Endpoint,
+  initV2ScheduleTrigger,
+  ManifestEndpoint,
+  ManifestRequiredAPI,
+} from "../../runtime/manifest";
+import { HttpsFunction } from "./https";
+import { wrapTraceContext } from "../trace";
+import { Expression } from "../../params";
+import * as logger from "../../logger";
+import * as options from "../options";
 
 /** @hidden */
 interface ScheduleArgs {
-  schedule: string;
-  timeZone?: timezone;
-  retryCount?: number;
-  maxRetrySeconds?: number;
-  minBackoffSeconds?: number;
-  maxBackoffSeconds?: number;
-  maxDoublings?: number;
+  schedule: string | Expression<string>;
+  timeZone?: timezone | Expression<string> | ResetValue;
+  retryCount?: number | Expression<number> | ResetValue;
+  maxRetrySeconds?: number | Expression<number> | ResetValue;
+  minBackoffSeconds?: number | Expression<number> | ResetValue;
+  maxBackoffSeconds?: number | Expression<number> | ResetValue;
+  maxDoublings?: number | Expression<number> | ResetValue;
   opts: options.GlobalOptions;
 }
 
 /** @internal */
 export function getOpts(args: string | ScheduleOptions): ScheduleArgs {
-  if (typeof args === 'string') {
+  if (typeof args === "string") {
     return {
       schedule: args,
       opts: {} as options.GlobalOptions,
@@ -95,22 +104,22 @@ export interface ScheduleOptions extends options.GlobalOptions {
   schedule: string;
 
   /** The timezone that the schedule executes in. */
-  timeZone?: timezone;
+  timeZone?: timezone | Expression<string> | ResetValue;
 
   /** The number of retry attempts for a failed run. */
-  retryCount?: number;
+  retryCount?: number | Expression<number> | ResetValue;
 
   /** The time limit for retrying. */
-  maxRetrySeconds?: number;
+  maxRetrySeconds?: number | Expression<number> | ResetValue;
 
   /** The minimum time to wait before retying. */
-  minBackoffSeconds?: number;
+  minBackoffSeconds?: number | Expression<number> | ResetValue;
 
   /** The maximum time to wait before retrying. */
-  maxBackoffSeconds?: number;
+  maxBackoffSeconds?: number | Expression<number> | ResetValue;
 
   /** The time between will double max doublings times. */
-  maxDoublings?: number;
+  maxDoublings?: number | Expression<number> | ResetValue;
 }
 
 /**
@@ -122,7 +131,7 @@ export interface ScheduleOptions extends options.GlobalOptions {
  */
 export function onSchedule(
   schedule: string,
-  handler: (req: ScheduledEvent) => void | Promise<void>
+  handler: (event: ScheduledEvent) => void | Promise<void>
 ): ScheduleFunction;
 
 /**
@@ -134,7 +143,7 @@ export function onSchedule(
  */
 export function onSchedule(
   options: ScheduleOptions,
-  handler: (req: ScheduledEvent) => void | Promise<void>
+  handler: (event: ScheduledEvent) => void | Promise<void>
 ): ScheduleFunction;
 
 /**
@@ -146,18 +155,14 @@ export function onSchedule(
  */
 export function onSchedule(
   args: string | ScheduleOptions,
-  handler: (req: ScheduledEvent) => void | Promise<void>
+  handler: (event: ScheduledEvent) => void | Promise<void>
 ): ScheduleFunction {
   const separatedOpts = getOpts(args);
 
-  const func: any = async (
-    req: express.Request,
-    res: express.Response
-  ): Promise<any> => {
+  const httpFunc = async (req: express.Request, res: express.Response): Promise<any> => {
     const event: ScheduledEvent = {
-      jobName: req.header('X-CloudScheduler-JobName') || undefined,
-      scheduleTime:
-        req.header('X-CloudScheduler-ScheduleTime') || new Date().toISOString(),
+      jobName: req.header("X-CloudScheduler-JobName") || undefined,
+      scheduleTime: req.header("X-CloudScheduler-ScheduleTime") || new Date().toISOString(),
     };
     try {
       await handler(event);
@@ -167,42 +172,41 @@ export function onSchedule(
       res.status(500).send();
     }
   };
+  const func: any = wrapTraceContext(httpFunc);
   func.run = handler;
 
-  const baseOptsEndpoint = options.optionsToEndpoint(
-    options.getGlobalOptions()
-  );
+  const globalOpts = options.getGlobalOptions();
+  const baseOptsEndpoint = options.optionsToEndpoint(globalOpts);
   const specificOptsEndpoint = options.optionsToEndpoint(separatedOpts.opts);
 
   const ep: ManifestEndpoint = {
-    platform: 'gcfv2',
+    ...initV2Endpoint(globalOpts, separatedOpts.opts),
+    platform: "gcfv2",
     ...baseOptsEndpoint,
     ...specificOptsEndpoint,
     labels: {
       ...baseOptsEndpoint?.labels,
       ...specificOptsEndpoint?.labels,
     },
-    scheduleTrigger: {
-      schedule: separatedOpts.schedule,
-      retryConfig: {},
-    },
+    scheduleTrigger: initV2ScheduleTrigger(separatedOpts.schedule, globalOpts, separatedOpts.opts),
   };
-  copyIfPresent(ep.scheduleTrigger, separatedOpts, 'timeZone');
+
+  copyIfPresent(ep.scheduleTrigger, separatedOpts, "timeZone");
   copyIfPresent(
     ep.scheduleTrigger.retryConfig,
     separatedOpts,
-    'retryCount',
-    'maxRetrySeconds',
-    'minBackoffSeconds',
-    'maxBackoffSeconds',
-    'maxDoublings'
+    "retryCount",
+    "maxRetrySeconds",
+    "minBackoffSeconds",
+    "maxBackoffSeconds",
+    "maxDoublings"
   );
   func.__endpoint = ep;
 
   func.__requiredAPIs = [
     {
-      api: 'cloudscheduler.googleapis.com',
-      reason: 'Needed for scheduled functions.',
+      api: "cloudscheduler.googleapis.com",
+      reason: "Needed for scheduled functions.",
     },
   ];
 
diff --git a/src/v2/providers/storage.ts b/src/v2/providers/storage.ts
index fd8a2131e..3428576bf 100644
--- a/src/v2/providers/storage.ts
+++ b/src/v2/providers/storage.ts
@@ -25,12 +25,15 @@
  * @packageDocumentation
  */
 
-import { copyIfPresent } from '../../common/encoding';
-import { firebaseConfig } from '../../config';
-import { ManifestEndpoint } from '../../runtime/manifest';
-import { CloudEvent, CloudFunction } from '../core';
-import * as options from '../options';
-import { Expression } from '../params';
+import { firebaseConfig } from "../../common/config";
+import { copyIfPresent } from "../../common/encoding";
+import { ResetValue } from "../../common/options";
+import { initV2Endpoint, ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { wrapTraceContext } from "../trace";
+import { Expression } from "../../params";
+import * as options from "../options";
+import { SecretParam } from "../../params/types";
 
 /**
  * An object within Google Cloud Storage.
@@ -40,7 +43,7 @@ export interface StorageObjectData {
   /**
    * The name of the bucket containing this object.
    */
-  bucket?: string;
+  bucket: string;
   /**
    * Cache-Control directive for the object data, matching
    * [https://tools.ietf.org/html/rfc7234#section-5.2"][RFC 7234 §5.2].
@@ -95,12 +98,12 @@ export interface StorageObjectData {
    * The content generation of this object. Used for object versioning.
    * Attempting to set this field will result in an error.
    */
-  generation?: number;
+  generation: number;
   /**
    * The ID of the object, including the bucket name, object name, and
    * generation number.
    */
-  id?: string;
+  id: string;
   /**
    * The kind of item this is. For objects, this is always "storage#object".
    */
@@ -127,11 +130,11 @@ export interface StorageObjectData {
    * number is only meaningful in the context of a particular generation of a
    * particular object.
    */
-  metageneration?: number;
+  metageneration: number;
   /**
    * The name of the object.
    */
-  name?: string;
+  name: string;
   /**
    * The link to this object.
    */
@@ -140,11 +143,11 @@ export interface StorageObjectData {
    * Content-Length of the object data in bytes, matching
    * [https://tools.ietf.org/html/rfc7230#section-3.3.2][RFC 7230 §3.3.2].
    */
-  size?: number;
+  size: number;
   /**
    * Storage class of the object.
    */
-  storageClass?: string;
+  storageClass: string;
   /**
    * The creation time of the object.
    * Attempting to set this field will result in an error.
@@ -187,14 +190,13 @@ export interface StorageEvent extends CloudEvent<StorageObjectData> {
 }
 
 /** @internal */
-export const archivedEvent = 'google.cloud.storage.object.v1.archived';
+export const archivedEvent = "google.cloud.storage.object.v1.archived";
 /** @internal */
-export const finalizedEvent = 'google.cloud.storage.object.v1.finalized';
+export const finalizedEvent = "google.cloud.storage.object.v1.finalized";
 /** @internal */
-export const deletedEvent = 'google.cloud.storage.object.v1.deleted';
+export const deletedEvent = "google.cloud.storage.object.v1.deleted";
 /** @internal */
-export const metadataUpdatedEvent =
-  'google.cloud.storage.object.v1.metadataUpdated';
+export const metadataUpdatedEvent = "google.cloud.storage.object.v1.metadataUpdated";
 
 /** StorageOptions extend EventHandlerOptions with a bucket name  */
 export interface StorageOptions extends options.EventHandlerOptions {
@@ -208,78 +210,78 @@ export interface StorageOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -289,10 +291,10 @@ export interface StorageOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
-  retry?: boolean;
+  retry?: boolean | Expression<boolean> | ResetValue;
 }
 
 /**
@@ -345,10 +347,7 @@ export function onObjectArchived(
  * @param handler - Event handler which is run every time a Google Cloud Storage archival occurs.
  */
 export function onObjectArchived(
-  bucketOrOptsOrHandler:
-    | string
-    | StorageOptions
-    | ((event: StorageEvent) => any | Promise<any>),
+  bucketOrOptsOrHandler: string | StorageOptions | ((event: StorageEvent) => any | Promise<any>),
   handler?: (event: StorageEvent) => any | Promise<any>
 ): CloudFunction<StorageEvent> {
   return onOperation(archivedEvent, bucketOrOptsOrHandler, handler);
@@ -412,10 +411,7 @@ export function onObjectFinalized(
  * @param handler - Event handler which is run every time a Google Cloud Storage object creation occurs.
  */
 export function onObjectFinalized(
-  bucketOrOptsOrHandler:
-    | string
-    | StorageOptions
-    | ((event: StorageEvent) => any | Promise<any>),
+  bucketOrOptsOrHandler: string | StorageOptions | ((event: StorageEvent) => any | Promise<any>),
   handler?: (event: StorageEvent) => any | Promise<any>
 ): CloudFunction<StorageEvent> {
   return onOperation(finalizedEvent, bucketOrOptsOrHandler, handler);
@@ -483,10 +479,7 @@ export function onObjectDeleted(
  * @param handler - Event handler which is run every time a Google Cloud Storage object deletion occurs.
  */
 export function onObjectDeleted(
-  bucketOrOptsOrHandler:
-    | string
-    | StorageOptions
-    | ((event: StorageEvent) => any | Promise<any>),
+  bucketOrOptsOrHandler: string | StorageOptions | ((event: StorageEvent) => any | Promise<any>),
   handler?: (event: StorageEvent) => any | Promise<any>
 ): CloudFunction<StorageEvent> {
   return onOperation(deletedEvent, bucketOrOptsOrHandler, handler);
@@ -535,10 +528,7 @@ export function onObjectMetadataUpdated(
  * @param handler - Event handler which is run every time a Google Cloud Storage object metadata update occurs.
  */
 export function onObjectMetadataUpdated(
-  bucketOrOptsOrHandler:
-    | string
-    | StorageOptions
-    | ((event: StorageEvent) => any | Promise<any>),
+  bucketOrOptsOrHandler: string | StorageOptions | ((event: StorageEvent) => any | Promise<any>),
   handler?: (event: StorageEvent) => any | Promise<any>
 ): CloudFunction<StorageEvent> {
   return onOperation(metadataUpdatedEvent, bucketOrOptsOrHandler, handler);
@@ -547,52 +537,22 @@ export function onObjectMetadataUpdated(
 /** @internal */
 export function onOperation(
   eventType: string,
-  bucketOrOptsOrHandler:
-    | string
-    | StorageOptions
-    | ((event: StorageEvent) => any | Promise<any>),
+  bucketOrOptsOrHandler: string | StorageOptions | ((event: StorageEvent) => any | Promise<any>),
   handler: (event: StorageEvent) => any | Promise<any>
 ): CloudFunction<StorageEvent> {
-  if (typeof bucketOrOptsOrHandler === 'function') {
-    handler = bucketOrOptsOrHandler as (
-      event: StorageEvent
-    ) => any | Promise<any>;
+  if (typeof bucketOrOptsOrHandler === "function") {
+    handler = bucketOrOptsOrHandler as (event: StorageEvent) => any | Promise<any>;
     bucketOrOptsOrHandler = {};
   }
 
-  const [opts, bucket] = getOptsAndBucket(
-    bucketOrOptsOrHandler as string | StorageOptions
-  );
+  const [opts, bucket] = getOptsAndBucket(bucketOrOptsOrHandler);
 
   const func = (raw: CloudEvent<unknown>) => {
-    return handler(raw as StorageEvent);
+    return wrapTraceContext(handler)(raw as StorageEvent);
   };
 
   func.run = handler;
 
-  Object.defineProperty(func, '__trigger', {
-    get: () => {
-      const baseOpts = options.optionsToTriggerAnnotations(
-        options.getGlobalOptions()
-      );
-      const specificOpts = options.optionsToTriggerAnnotations(opts);
-
-      return {
-        platform: 'gcfv2',
-        ...baseOpts,
-        ...specificOpts,
-        labels: {
-          ...baseOpts?.labels,
-          ...specificOpts?.labels,
-        },
-        eventTrigger: {
-          eventType,
-          resource: bucket, // TODO(colerogers): replace with 'bucket,' eventually
-        },
-      };
-    },
-  });
-
   // TypeScript doesn't recognize defineProperty as adding a property and complains
   // that __endpoint doesn't exist. We can either cast to any and lose all type safety
   // or we can just assign a meaningless value before calling defineProperty.
@@ -600,13 +560,14 @@ export function onOperation(
 
   // SDK may attempt to read FIREBASE_CONFIG env var to fetch the default bucket name.
   // To prevent runtime errors when FIREBASE_CONFIG env var is missing, we use getters.
-  Object.defineProperty(func, '__endpoint', {
+  Object.defineProperty(func, "__endpoint", {
     get: () => {
       const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
       const specificOpts = options.optionsToEndpoint(opts);
 
       const endpoint: ManifestEndpoint = {
-        platform: 'gcfv2',
+        platform: "gcfv2",
+        ...initV2Endpoint(options.getGlobalOptions(), opts),
         ...baseOpts,
         ...specificOpts,
         labels: {
@@ -619,7 +580,7 @@ export function onOperation(
           retry: false,
         },
       };
-      copyIfPresent(endpoint.eventTrigger, opts, 'retry', 'retry');
+      copyIfPresent(endpoint.eventTrigger, opts, "retry", "retry");
       return endpoint;
     },
   });
@@ -633,7 +594,7 @@ export function getOptsAndBucket(
 ): [options.EventHandlerOptions, string] {
   let bucket: string;
   let opts: options.EventHandlerOptions;
-  if (typeof bucketOrOpts === 'string') {
+  if (typeof bucketOrOpts === "string") {
     bucket = bucketOrOpts;
     opts = {};
   } else {
@@ -644,8 +605,8 @@ export function getOptsAndBucket(
 
   if (!bucket) {
     throw new Error(
-      'Missing bucket name. If you are unit testing, please provide a bucket name' +
-        ' by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG.'
+      "Missing bucket name. If you are unit testing, please provide a bucket name" +
+        " by providing bucket name directly in the event handler or by setting process.env.FIREBASE_CONFIG."
     );
   }
   if (!/^[a-z\d][a-z\d\\._-]{1,230}[a-z\d]$/.test(bucket)) {
diff --git a/src/v2/providers/tasks.ts b/src/v2/providers/tasks.ts
index efc99e273..f6e63b210 100644
--- a/src/v2/providers/tasks.ts
+++ b/src/v2/providers/tasks.ts
@@ -25,21 +25,21 @@
  * @packageDocumentation
  */
 
-import {
-  convertIfPresent,
-  convertInvoker,
-  copyIfPresent,
-} from '../../common/encoding';
+import { convertIfPresent, convertInvoker, copyIfPresent } from "../../common/encoding";
+import { ResetValue } from "../../common/options";
 import {
   AuthData,
   onDispatchHandler,
   RateLimits,
   Request,
   RetryConfig,
-} from '../../common/providers/tasks';
-import * as options from '../options';
-import { Expression } from '../params';
-import { HttpsFunction } from './https';
+} from "../../common/providers/tasks";
+import * as options from "../options";
+import { wrapTraceContext } from "../trace";
+import { HttpsFunction } from "./https";
+import { Expression } from "../../params";
+import { SecretParam } from "../../params/types";
+import { initV2Endpoint, initTaskQueueTrigger } from "../../runtime/manifest";
 
 export { AuthData, Request };
 
@@ -52,11 +52,13 @@ export interface TaskQueueOptions extends options.EventHandlerOptions {
 
   /**
    * Who can enqueue tasks for this function.
+   *
+   * @remakrs
    * If left unspecified, only service accounts which have
    * `roles/cloudtasks.enqueuer` and `roles/cloudfunctions.invoker`
    * will have permissions.
    */
-  invoker?: 'private' | string | string[];
+  invoker?: "private" | string | string[];
 
   /**
    * Region where functions should be deployed.
@@ -65,78 +67,78 @@ export interface TaskQueueOptions extends options.EventHandlerOptions {
 
   /**
    * Amount of memory to allocate to a function.
-   * A value of null restores the defaults of 256MB.
    */
-  memory?: options.MemoryOption | Expression<number> | null;
+  memory?: options.MemoryOption | Expression<number> | ResetValue;
 
   /**
    * Timeout for the function in sections, possible values are 0 to 540.
    * HTTPS functions can specify a higher timeout.
-   * A value of null restores the default of 60s
+   *
+   * @remarks
    * The minimum timeout for a gen 2 function is 1s. The maximum timeout for a
    * function depends on the type of function: Event handling functions have a
    * maximum timeout of 540s (9 minutes). HTTPS and callable functions have a
    * maximum timeout of 36,00s (1 hour). Task queue functions have a maximum
    * timeout of 1,800s (30 minutes)
    */
-  timeoutSeconds?: number | Expression<number> | null;
+  timeoutSeconds?: number | Expression<number> | ResetValue;
 
   /**
    * Min number of actual instances to be running at a given time.
+   *
+   * @remarks
    * Instances will be billed for memory allocation and 10% of CPU allocation
    * while idle.
-   * A value of null restores the default min instances.
    */
-  minInstances?: number | Expression<number> | null;
+  minInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Max number of instances to be running in parallel.
-   * A value of null restores the default max instances.
    */
-  maxInstances?: number | Expression<number> | null;
+  maxInstances?: number | Expression<number> | ResetValue;
 
   /**
    * Number of requests a function can serve at once.
+   *
+   * @remarks
    * Can only be applied to functions running on Cloud Functions v2.
    * A value of null restores the default concurrency (80 when CPU >= 1, 1 otherwise).
    * Concurrency cannot be set to any value other than 1 if `cpu` is less than 1.
    * The maximum value for concurrency is 1,000.
    */
-  concurrency?: number | Expression<number> | null;
+  concurrency?: number | Expression<number> | ResetValue;
 
   /**
    * Fractional number of CPUs to allocate to a function.
+   *
+   * @remarks
    * Defaults to 1 for functions with <= 2GB RAM and increases for larger memory sizes.
    * This is different from the defaults when using the gcloud utility and is different from
    * the fixed amount assigned in Google Cloud Functions generation 1.
    * To revert to the CPU amounts used in gcloud or in Cloud Functions generation 1, set this
    * to the value "gcf_gen1"
    */
-  cpu?: number | 'gcf_gen1';
+  cpu?: number | "gcf_gen1";
 
   /**
    * Connect cloud function to specified VPC connector.
-   * A value of null removes the VPC connector
    */
-  vpcConnector?: string | null;
+  vpcConnector?: string | ResetValue;
 
   /**
    * Egress settings for VPC connector.
-   * A value of null turns off VPC connector egress settings
    */
-  vpcConnectorEgressSettings?: options.VpcEgressSetting | null;
+  vpcConnectorEgressSettings?: options.VpcEgressSetting | ResetValue;
 
   /**
    * Specific service account for the function to run as.
-   * A value of null restores the default service account.
    */
-  serviceAccount?: string | null;
+  serviceAccount?: string | ResetValue;
 
   /**
    * Ingress settings which control where this function can be called from.
-   * A value of null turns off ingress settings.
    */
-  ingressSettings?: options.IngressSetting | null;
+  ingressSettings?: options.IngressSetting | ResetValue;
 
   /**
    * User labels to set on the function.
@@ -146,7 +148,7 @@ export interface TaskQueueOptions extends options.EventHandlerOptions {
   /*
    * Secrets to bind to a function.
    */
-  secrets?: string[];
+  secrets?: (string | SecretParam)[];
 
   /** Whether failed executions should be delivered again. */
   retry?: boolean;
@@ -171,7 +173,7 @@ export interface TaskQueueFunction<T = any> extends HttpsFunction {
  * Creates a handler for tasks sent to a Google Cloud Tasks queue.
  * @param handler - A callback to handle task requests.
  * @typeParam Args - The interface for the request's `data` field.
- * @returns A Cloud Function you can export and deploy.
+ * @returns A function you can export and deploy.
  */
 export function onTaskDispatched<Args = any>(
   handler: (request: Request<Args>) => void | Promise<void>
@@ -182,20 +184,18 @@ export function onTaskDispatched<Args = any>(
  * @param options - Configuration for the task queue or Cloud Function.
  * @param handler - A callback to handle task requests.
  * @typeParam Args - The interface for the request's `data` field.
- * @returns A Cloud Function you can export and deploy.
+ * @returns A function you can export and deploy.
  */
 export function onTaskDispatched<Args = any>(
   options: TaskQueueOptions,
   handler: (request: Request<Args>) => void | Promise<void>
 ): TaskQueueFunction<Args>;
 export function onTaskDispatched<Args = any>(
-  optsOrHandler:
-    | TaskQueueOptions
-    | ((request: Request<Args>) => void | Promise<void>),
+  optsOrHandler: TaskQueueOptions | ((request: Request<Args>) => void | Promise<void>),
   handler?: (request: Request<Args>) => void | Promise<void>
 ): TaskQueueFunction<Args> {
   let opts: TaskQueueOptions;
-  if (arguments.length == 1) {
+  if (arguments.length === 1) {
     opts = {};
     handler = optsOrHandler as (request: Request<Args>) => void | Promise<void>;
   } else {
@@ -205,68 +205,34 @@ export function onTaskDispatched<Args = any>(
   // onDispatchHandler sniffs the function length to determine which API to present.
   // fix the length to prevent api versions from being mismatched.
   const fixedLen = (req: Request<Args>) => handler(req);
-  const func: any = onDispatchHandler(fixedLen);
-
-  Object.defineProperty(func, '__trigger', {
-    get: () => {
-      const baseOpts = options.optionsToTriggerAnnotations(
-        options.getGlobalOptions()
-      );
-      // global options calls region a scalar and https allows it to be an array,
-      // but optionsToTriggerAnnotations handles both cases.
-      const specificOpts = options.optionsToTriggerAnnotations(
-        opts as options.GlobalOptions
-      );
-      const taskQueueTrigger: Record<string, unknown> = {};
-      copyIfPresent(taskQueueTrigger, opts, 'retryConfig', 'rateLimits');
-      convertIfPresent(
-        taskQueueTrigger,
-        opts,
-        'invoker',
-        'invoker',
-        convertInvoker
-      );
-      return {
-        platform: 'gcfv2',
-        ...baseOpts,
-        ...specificOpts,
-        labels: {
-          ...baseOpts?.labels,
-          ...specificOpts?.labels,
-        },
-        taskQueueTrigger,
-      };
-    },
-  });
+  const func: any = wrapTraceContext(onDispatchHandler(fixedLen));
 
-  const baseOpts = options.optionsToEndpoint(options.getGlobalOptions());
+  const globalOpts = options.getGlobalOptions();
+  const baseOpts = options.optionsToEndpoint(globalOpts);
   // global options calls region a scalar and https allows it to be an array,
   // but optionsToManifestEndpoint handles both cases.
   const specificOpts = options.optionsToEndpoint(opts as options.GlobalOptions);
+
   func.__endpoint = {
-    platform: 'gcfv2',
+    platform: "gcfv2",
+    ...initV2Endpoint(options.getGlobalOptions(), opts),
     ...baseOpts,
     ...specificOpts,
     labels: {
       ...baseOpts?.labels,
       ...specificOpts?.labels,
     },
-    taskQueueTrigger: {},
+    taskQueueTrigger: initTaskQueueTrigger(options.getGlobalOptions(), opts),
   };
-  copyIfPresent(func.__endpoint.taskQueueTrigger, opts, 'retryConfig');
-  copyIfPresent(func.__endpoint.taskQueueTrigger, opts, 'rateLimits');
-  convertIfPresent(
-    func.__endpoint.taskQueueTrigger,
-    opts,
-    'invoker',
-    'invoker',
-    convertInvoker
-  );
+
+  copyIfPresent(func.__endpoint.taskQueueTrigger, opts, "retryConfig");
+  copyIfPresent(func.__endpoint.taskQueueTrigger, opts, "rateLimits");
+  convertIfPresent(func.__endpoint.taskQueueTrigger, opts, "invoker", "invoker", convertInvoker);
 
   func.__requiredAPIs = [
     {
-      api: 'cloudtasks.googleapis.com',
-      reason: 'Needed for task queue functions',
+      api: "cloudtasks.googleapis.com",
+      reason: "Needed for task queue functions",
     },
   ];
 
diff --git a/src/v2/providers/testLab.ts b/src/v2/providers/testLab.ts
new file mode 100644
index 000000000..16d95ea6a
--- /dev/null
+++ b/src/v2/providers/testLab.ts
@@ -0,0 +1,214 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { ManifestEndpoint } from "../../runtime/manifest";
+import { CloudEvent, CloudFunction } from "../core";
+import { EventHandlerOptions, getGlobalOptions, optionsToEndpoint } from "../options";
+import { wrapTraceContext } from "../trace";
+
+/** @internal */
+export const eventType = "google.firebase.testlab.testMatrix.v1.completed";
+
+/** Possible test states for a test matrix. */
+export type TestState =
+  /** The default value. This value is used if the state is omitted. */
+  | "TEST_STATE_UNSPECIFIED"
+
+  /** The test matrix is being validated. */
+  | "VALIDATING"
+
+  /** The test matrix is waiting for resources to become available. */
+  | "PENDING"
+
+  /** The test matrix has completed normally. */
+  | "FINISHED"
+
+  /** The test matrix has completed because of an infrastructure failure. */
+  | "ERROR"
+
+  /** The test matrix was not run because the provided inputs are not valid. */
+  | "INVALID";
+
+/** Outcome summary for a finished test matrix. */
+export type OutcomeSummary =
+  /** The default value. This value is used if the state is omitted. */
+  | "OUTCOME_SUMMARY_UNSPECIFIED"
+
+  /**
+   * The test matrix run was successful, for instance:
+   * - All test cases passed.
+   * - No crash of the application under test was detected.
+   */
+  | "SUCCESS"
+
+  /**
+   * A run failed, for instance:
+   * - One or more test case failed.
+   * - A test timed out.
+   * - The application under test crashed.
+   */
+  | "FAILURE"
+
+  /**
+   * Something unexpected happened. The test run should still be considered
+   * unsuccessful but this is likely a transient problem and re-running the
+   * test might be successful.
+   */
+  | "INCONCLUSIVE"
+
+  /** All tests were skipped. */
+  | "SKIPPED";
+
+/** Locations where test results are stored. */
+export interface ResultStorage {
+  /**
+   * Tool Results history resource containing test results. Format is
+   * `projects/{project_id}/histories/{history_id}`.
+   * See https://firebase.google.com/docs/test-lab/reference/toolresults/rest
+   * for more information.
+   */
+  toolResultsHistory: string;
+
+  /**
+   * Tool Results execution resource containing test results. Format is
+   * `projects/{project_id}/histories/{history_id}/executions/{execution_id}`.
+   * Optional, can be omitted in erroneous test states.
+   * See https://firebase.google.com/docs/test-lab/reference/toolresults/rest
+   * for more information.
+   */
+  toolResultsExecution: string;
+
+  /** URI to the test results in the Firebase Web Console. */
+  resultsUri: string;
+
+  /**
+   * Location in Google Cloud Storage where test results are written to.
+   * In the form "gs://bucket/path/to/somewhere".
+   */
+  gcsPath: string;
+}
+
+/** Information about the client which invoked the test. */
+export interface ClientInfo {
+  /** Client name, such as "gcloud". */
+  client: string;
+
+  /** Map of detailed information about the client. */
+  details: Record<string, string>;
+}
+
+/** The data within all Firebase test matrix completed events. */
+export interface TestMatrixCompletedData {
+  /** Time the test matrix was created. */
+  createTime: string;
+
+  /** State of the test matrix. */
+  state: TestState;
+
+  /**
+   * Code that describes why the test matrix is considered invalid. Only set for
+   * matrices in the INVALID state.
+   */
+  invalidMatrixDetails: string;
+
+  /** Outcome summary of the test matrix. */
+  outcomeSummary: OutcomeSummary;
+
+  /** Locations where test results are stored. */
+  resultStorage: ResultStorage;
+
+  /** Information provided by the client that created the test matrix. */
+  clientInfo: ClientInfo;
+
+  /** ID of the test matrix this event belongs to. */
+  testMatrixId: string;
+}
+
+/**
+ * Event handler which triggers when a Firebase test matrix completes.
+ *
+ * @param handler - Event handler which is run every time a Firebase test matrix completes.
+ * @returns A Cloud Function that you can export and deploy.
+ * @alpha
+ */
+export function onTestMatrixCompleted(
+  handler: (event: CloudEvent<TestMatrixCompletedData>) => any | Promise<any>
+): CloudFunction<CloudEvent<TestMatrixCompletedData>>;
+
+/**
+ * Event handler which triggers when a Firebase test matrix completes.
+ *
+ * @param opts - Options that can be set on an individual event-handling function.
+ * @param handler - Event handler which is run every time a Firebase test matrix completes.
+ * @returns A Cloud Function that you can export and deploy.
+ * @alpha
+ */
+export function onTestMatrixCompleted(
+  opts: EventHandlerOptions,
+  handler: (event: CloudEvent<TestMatrixCompletedData>) => any | Promise<any>
+): CloudFunction<CloudEvent<TestMatrixCompletedData>>;
+
+/**
+ * Event handler which triggers when a Firebase test matrix completes.
+ *
+ * @param optsOrHandler - Options or an event handler.
+ * @param handler - Event handler which is run every time a Firebase test matrix completes.
+ * @returns A Cloud Function that you can export and deploy.
+ * @alpha
+ */
+export function onTestMatrixCompleted(
+  optsOrHandler:
+    | EventHandlerOptions
+    | ((event: CloudEvent<TestMatrixCompletedData>) => any | Promise<any>),
+  handler?: (event: CloudEvent<TestMatrixCompletedData>) => any | Promise<any>
+): CloudFunction<CloudEvent<TestMatrixCompletedData>> {
+  if (typeof optsOrHandler === "function") {
+    handler = optsOrHandler as (event: CloudEvent<TestMatrixCompletedData>) => any | Promise<any>;
+    optsOrHandler = {};
+  }
+
+  const baseOpts = optionsToEndpoint(getGlobalOptions());
+  const specificOpts = optionsToEndpoint(optsOrHandler);
+
+  const func: any = (raw: CloudEvent<unknown>) => {
+    return wrapTraceContext(handler(raw as CloudEvent<TestMatrixCompletedData>));
+  };
+  func.run = handler;
+
+  const ep: ManifestEndpoint = {
+    platform: "gcfv2",
+    ...baseOpts,
+    ...specificOpts,
+    labels: {
+      ...baseOpts?.labels,
+      ...specificOpts?.labels,
+    },
+    eventTrigger: {
+      eventType,
+      eventFilters: {},
+      retry: !!optsOrHandler.retry,
+    },
+  };
+  func.__endpoint = ep;
+
+  return func;
+}
diff --git a/src/v2/trace.ts b/src/v2/trace.ts
new file mode 100644
index 000000000..2bb9e2179
--- /dev/null
+++ b/src/v2/trace.ts
@@ -0,0 +1,33 @@
+import * as express from "express";
+
+import { TraceContext, extractTraceContext, traceContext } from "../common/trace";
+import { CloudEvent } from "./core";
+
+type HttpsFunction = (req: express.Request, res: express.Response) => void | Promise<void>;
+type CloudEventFunction<T> = (raw: CloudEvent<T>) => any | Promise<any>;
+
+/**
+ * Wraps v2 handler with trace context.
+ * @param handler
+ *
+ * @internal
+ */
+export function wrapTraceContext(handler: HttpsFunction): HttpsFunction;
+export function wrapTraceContext<T>(handler: CloudEventFunction<T>): CloudEventFunction<T>;
+export function wrapTraceContext(
+  handler: HttpsFunction | CloudEventFunction<unknown>
+): HttpsFunction | CloudEventFunction<unknown> {
+  return (...args) => {
+    let traceParent: TraceContext | undefined;
+    if (args.length === 1) {
+      traceParent = extractTraceContext(args[0]);
+    } else {
+      traceParent = extractTraceContext(args[0].headers);
+    }
+    if (!traceParent) {
+      // eslint-disable-next-line prefer-spread
+      return handler.apply(null, args);
+    }
+    traceContext.run(traceParent, handler, ...args);
+  };
+}
diff --git a/tsconfig.json b/tsconfig.json
index 6538f1f07..8049f1d64 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,5 +4,9 @@
     "sourceMap": true
   },
   "extends": "./tsconfig.release.json",
-  "include": ["**/*.ts"]
+  "include": [
+    "**/*.ts",
+    ".eslintrc.js",
+    "integration_test/**/*"
+  ]
 }
diff --git a/tsconfig.release.json b/tsconfig.release.json
index b98955ee5..5d48aa842 100644
--- a/tsconfig.release.json
+++ b/tsconfig.release.json
@@ -1,18 +1,18 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "lib": ["es2018"],
+    "lib": ["es2019"],
     "module": "commonjs",
     "noImplicitAny": false,
     "noUnusedLocals": true,
     "outDir": "lib",
     "stripInternal": true,
-    "target": "es2018",
+    "target": "es2019",
     "typeRoots": ["./node_modules/@types"]
   },
   "files": [
     "./src/types/global.d.ts",
-    "./src/index.ts",
+    "./src/v1/index.ts",
     "./src/logger/index.ts",
     "./src/logger/compat.ts",
     "./src/v2/index.ts",
diff --git a/src/utils.ts b/v2/remoteConfig.js
similarity index 68%
rename from src/utils.ts
rename to v2/remoteConfig.js
index e41b1e1fb..ae33ba821 100644
--- a/src/utils.ts
+++ b/v2/remoteConfig.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2017 Firebase
+// Copyright (c) 2022 Firebase
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,25 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-/** @hidden */
-import * as _ from 'lodash';
-
-export function applyChange(src: any, dest: any) {
-  // if not mergeable, don't merge
-  if (!_.isPlainObject(dest) || !_.isPlainObject(src)) {
-    return dest;
-  }
-
-  return pruneNulls(_.merge({}, src, dest));
-}
-
-export function pruneNulls(obj: any) {
-  for (const key in obj) {
-    if (obj[key] === null) {
-      delete obj[key];
-    } else if (_.isPlainObject(obj[key])) {
-      pruneNulls(obj[key]);
-    }
-  }
-  return obj;
-}
+// This file is not part of the firebase-functions SDK. It is used to silence the
+// imports eslint plugin until it can understand import paths defined by node
+// package exports.
+// For more information, see github.com/import-js/eslint-plugin-import/issues/1810
diff --git a/v2/testLab.js b/v2/testLab.js
new file mode 100644
index 000000000..ae33ba821
--- /dev/null
+++ b/v2/testLab.js
@@ -0,0 +1,26 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2022 Firebase
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+// This file is not part of the firebase-functions SDK. It is used to silence the
+// imports eslint plugin until it can understand import paths defined by node
+// package exports.
+// For more information, see github.com/import-js/eslint-plugin-import/issues/1810