Format and clean up typos

firebase · joehan · Feb 16, 2021 · Jan 19, 2021 · Jan 20, 2021 · Jan 20, 2021
commit 3b3edbd103347c73e58d3a830738554b6a6abbb1
diff --git a/src/deploy/functions/errorHandler.ts b/src/deploy/functions/errorHandler.ts
@@ -77,9 +77,9 @@ export class ErrorHandler {
  for (const failedDep of failedIamCalls) {
  logger.info(`\t${failedDep.functionName}`);
  }
- logger.info("\n\nUnauithorized users will not be able access this function.");
+ logger.info("\n\nUnauthorized users will not be able access this function.");
  logger.info(
- "\n\nThis may be caused by an organization policy that restrict Network Access on your project."
+ "\n\nThis may be caused by an organization policy that restricts Network Access on your project."
  );
  }
 

diff --git a/src/deploy/functions/release.ts b/src/deploy/functions/release.ts
@@ -30,11 +30,11 @@ export async function release(context: any, options: any, payload: any) {
  context.existingFunctions,
  context.filters
  );
- const cloudFunctionsQueue = new Queue<() => Promise<CloudFunctionTrigger|void>, void>({});
+ const cloudFunctionsQueue = new Queue<() => Promise<CloudFunctionTrigger | void>, void>({});
  const schedulerQueue = new Queue<() => Promise<any>, void>({});
  const regionPromises = [];
 
- const retryFuncParams: tasks.RetryFunctionParams = {
+ const taskParams: tasks.TaskParams = {
  projectId,
  sourceUrl,
  runtime: context.runtimeChoice,
@@ -50,7 +50,7 @@ export async function release(context: any, options: any, payload: any) {
  if (shouldDeleteFunctions) {
  for (const fnName of fullDeployment.functionsToDelete) {
  cloudFunctionsQueue
- .run(tasks.deleteFunctionTask(retryFuncParams, fnName))
+ .run(tasks.deleteFunctionTask(taskParams, fnName))
  .then(() => {
  helper.printSuccess(fnName, "delete");
  })
@@ -72,12 +72,12 @@ export async function release(context: any, options: any, payload: any) {
  for (const regionalDeployment of fullDeployment.regionalDeployments) {
  // Run the create and update function calls for the region.
  regionPromises.push(
- tasks.runRegionalFunctionDeployment(retryFuncParams, regionalDeployment, cloudFunctionsQueue)
+ tasks.runRegionalFunctionDeployment(taskParams, regionalDeployment, cloudFunctionsQueue)
  );
 
  // Add scheduler creates and updates to their queue.
  for (const fn of regionalDeployment.schedulesToUpsert) {
- const task = tasks.upsertScheduleTask(retryFuncParams, fn, appEngineLocation);
+ const task = tasks.upsertScheduleTask(taskParams, fn, appEngineLocation);
  schedulerQueue
  .run(task)
  .then(() => {
@@ -100,25 +100,20 @@ export async function release(context: any, options: any, payload: any) {
  }
 
  // Once everything has been added to queues, starting processing.
- const queuePromises = [cloudFunctionsQueue.wait(), schedulerQueue.wait()]; 
+ // Note: We need to set up these wait before calling process and close.
+ const queuePromises = [cloudFunctionsQueue.wait(), schedulerQueue.wait()];
  cloudFunctionsQueue.process();
  schedulerQueue.process();
  schedulerQueue.close();
 
  // Wait until the second round of creates/updates are added to the queue before closing it.
- await Promise.all(regionPromises)
+ await Promise.all(regionPromises);
  cloudFunctionsQueue.close();
 
  // Wait for the first function in each region to be deployed, and all the other calls to be queued,
  // then close the queue.
  // Wait for all of the deployments to complete.
  await Promise.all(queuePromises);
- // TODO: We should also await the scheduler queue. However, for reasons I don't understand,
- // awaiting 2 queues makes it so none of the code below this executes.
- // If I remove either queue, it works correctly.
- // Not sure if this is a bug with queue or if I'm doing something subtly incorrect, but functions deploys are ~2 orders of magnitude longer
- // than schedule deployments, and there are no deployments that contain only calls to scheduler, so this works for now.
- // await schedulerQueue.wait();
  helper.logAndTrackDeployStats(cloudFunctionsQueue);
  errorHandler.printWarnings();
  errorHandler.printErrors();

diff --git a/src/deploy/functions/tasks.ts b/src/deploy/functions/tasks.ts
@@ -22,7 +22,7 @@ const defaultPollerOptions = {
  masterTimeout: 150000,
 };
 
-export interface RetryFunctionParams {
+export interface TaskParams {
  projectId: string;
  runtime: string;
  sourceUrl: string;
@@ -32,7 +32,7 @@ export interface RetryFunctionParams {
 }
 
 export function createFunctionTask(
- params: RetryFunctionParams,
+ params: TaskParams,
  fn: CloudFunctionTrigger,
  onPoll?: (op: any) => any
 ): () => Promise<CloudFunctionTrigger> {
@@ -93,7 +93,7 @@ export function createFunctionTask(
 }
 
 export function updateFunctionTask(
- params: RetryFunctionParams,
+ params: TaskParams,
  fn: CloudFunctionTrigger,
  onPoll?: (op: any) => any
 ): () => Promise<CloudFunctionTrigger> {
@@ -141,7 +141,7 @@ export function updateFunctionTask(
  };
 }
 
-export function deleteFunctionTask(params: RetryFunctionParams, fnName: string) {
+export function deleteFunctionTask(params: TaskParams, fnName: string) {
  return async () => {
  utils.logBullet(
  clc.bold.cyan("functions: ") +
@@ -167,7 +167,7 @@ export function deleteFunctionTask(params: RetryFunctionParams, fnName: string)
 }
 
 export function upsertScheduleTask(
- params: RetryFunctionParams,
+ params: TaskParams,
  fn: CloudFunctionTrigger,
  appEngineLocation: string
 ): () => Promise<any> {
@@ -209,7 +209,7 @@ export function deleteScheduleTask(fnName: string, appEngineLocation: string): (
  * @param queue
  */
 export function runRegionalFunctionDeployment(
- params: RetryFunctionParams,
+ params: TaskParams,
  regionalDeployment: RegionalDeployment,
  queue: Queue<() => Promise<any>, void>
 ): Promise<void> {
@@ -258,9 +258,9 @@ export function runRegionalFunctionDeployment(
 }
 
 function finishRegionalFunctionDeployment(
- params: RetryFunctionParams,
+ params: TaskParams,
  regionalDeployment: RegionalDeployment,
- queue: Queue<()=>Promise<any>, void>
+ queue: Queue<() => Promise<any>, void>
 ): void {
  for (const fn of regionalDeployment.functionsToCreate) {
  queue