Update deps and API

Author: samtstern

packages/rules-unit-testing/package.json

@@ -15,7 +15,7 @@
     "build:deps": "lerna run --scope @firebase/rules-unit-testing --include-dependencies build",
     "dev": "rollup -c -w",
     "test:nyc": "TS_NODE_CACHE=NO TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --config ../../config/mocharc.node.js",
-    "test": "firebase --project=foo --debug emulators:exec 'yarn test:nyc'",
+    "test": "FIREBASE_CLI_PREVIEWS=storageemulator firebase --project=foo --debug emulators:exec 'yarn test:nyc'",
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "license": "Apache-2.0",
@@ -29,15 +29,15 @@
   "devDependencies": {
     "@google-cloud/firestore": "4.8.1",
     "@types/request": "2.48.5",
-    "firebase-admin": "9.4.2",
+    "firebase-admin": "9.7.0",
     "firebase-tools": "9.1.0",
     "firebase-functions": "3.13.0",
     "rollup": "2.35.1",
     "rollup-plugin-typescript2": "0.29.0"
   },
   "peerDependencies": {
     "@google-cloud/firestore": "^4.2.0",
-    "firebase-admin": "^9.0.0"
+    "firebase-admin": "^9.7.0"
   },
   "repository": {
     "directory": "packages/rules-unit-testing",

packages/rules-unit-testing/src/api/index.ts

@@ -37,7 +37,8 @@ const FIRESTORE_ADDRESS_ENV: string = 'FIRESTORE_EMULATOR_HOST';
 const FIRESTORE_ADDRESS_DEFAULT: string = 'localhost:8080';
 
 /** If this environment variable is set, use it for the Storage emulator. */
-const STORAGE_ADDRESS_ENV: string = 'STORAGE_EMULATOR_HOST';
+const FIREBASE_STORAGE_ADDRESS_ENV: string = 'FIREBASE_STORAGE_EMULATOR_HOST';
+const CLOUD_STORAGE_ADDRESS_ENV: string = 'STORAGE_EMULATOR_HOST';
 /** The default address for the local Firestore emulator. */
 const STORAGE_ADDRESS_DEFAULT: string = 'localhost:9199';
 
@@ -378,12 +379,15 @@ function getFirestoreHost() {
 
 function getStorageHost() {
   if (!_storageHost) {
-    const fromEnv = process.env[STORAGE_ADDRESS_ENV];
+    const fromEnv = process.env[FIREBASE_STORAGE_ADDRESS_ENV] || process.env[CLOUD_STORAGE_ADDRESS_ENV];
     if (fromEnv) {
-      _storageHost = fromEnv;
+      // The STORAGE_EMULATOR_HOST env var is an older Cloud Standard which includes http:// while
+      // the FIREBASE_STORAGE_EMULATOR_HOST is a newer variable supported beginning in the Admin
+      // SDK v9.7.0 which does not have the protocol.
+      _storageHost = fromEnv.replace("http://", "");
     } else {
       console.warn(
-        `Warning: ${STORAGE_ADDRESS_ENV} not set, using default value ${STORAGE_ADDRESS_DEFAULT}`
+        `Warning: ${FIREBASE_STORAGE_ADDRESS_ENV} not set, using default value ${STORAGE_ADDRESS_DEFAULT}`
       );
       _storageHost = STORAGE_ADDRESS_DEFAULT;
     }
@@ -564,29 +568,21 @@ export async function loadFirestoreRules(
 }
 
 export type LoadStorageRulesOptions = {
-  storageBucket: string;
   rules: string;
 };
 export async function loadStorageRules(
   options: LoadStorageRulesOptions
 ): Promise<void> {
-  if (!options.storageBucket) {
-    throw new Error('storageBucket not specified');
-  }
-
   if (!options.rules) {
     throw new Error('must provide rules to loadStorageRules');
   }
 
-  // TODO: This endpoint is not yet implemented! Will need a change in firebase-tools
-  //       to make this real.
   const resp = await requestPromise(request.put, {
     method: 'PUT',
     uri: `http://${getStorageHost()}/internal/setRules`,
     body: JSON.stringify({
-      storageBucket: options.storageBucket,
       rules: {
-        files: [{ content: options.rules }]
+        files: [{ name: 'storage.rules', content: options.rules }]
       }
     })
   });

yarn.lock

@@ -7463,10 +7463,10 @@ fined@^1.0.1:
     object.pick "^1.2.0"
     parse-filepath "^1.0.1"
 
-firebase-admin@9.4.2:
-  version "9.4.2"
-  resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.4.2.tgz#190d5d7ca5e3f251d99503feb6e05e7ab1623851"
-  integrity sha512-mRnBJbW6BAz6DJkZ0GOUTkmnmCrwVzMreMc6O+RXWukFydOzi5Xr6TKSiPKxoOQw41r9IluP2AZ3Qzvlx2SR+g==
+firebase-admin@9.7.0:
+  version "9.7.0"
+  resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-9.7.0.tgz#c5fde178a1f1e757373b38601eb62a8ccbcb9393"
+  integrity sha512-dvxy4lK2P2BikE9lB2hj4dUXGm9tuoGRVtobXzCpk7uhi0/FuTOU1yp4IW7vlMI20fxTdm6FmCXdwUlMeSljBA==
   dependencies:
     "@firebase/database" "^0.8.1"
     "@firebase/database-types" "^0.6.1"
@@ -7487,7 +7487,7 @@ [email protected]:
     "@firebase/app-exp" "0.0.900"
     "@firebase/auth-compat" "0.0.900"
     "@firebase/auth-exp" "0.0.900"
-    "@firebase/database" "0.9.11"
+    "@firebase/database" "0.9.12"
     "@firebase/firestore" "2.2.5"
     "@firebase/functions-compat" "0.0.900"
     "@firebase/functions-exp" "0.0.900"