Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Major refactor of functions deploy #3132

Merged
merged 37 commits into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
06b62a1
Adding onPoll option to operation-poller (#3046)
joehan Jan 19, 2021
6258dd5
Typescriptify functionsDeployHelper (#3059)
joehan Jan 20, 2021
ec7d079
Typescriptifying gcp.cloudfunctions (#3060)
joehan Jan 20, 2021
f583ef6
Typescriptifying functionsConfig (#3063)
joehan Jan 21, 2021
08b9d56
Typescriptifying deploymentTool (#3061)
joehan Jan 21, 2021
b4944a4
Refactoring prepare stage of functions deploy (#3067)
joehan Jan 21, 2021
3be0dca
refactoring release step of functions deploy to use typescript
joehan Jan 21, 2021
e0e703e
Adding logic to build regional deployments
joehan Jan 24, 2021
046c7d7
Implementing createDeploymentPlan
joehan Jan 26, 2021
b876523
First round of PR feedback, removing most usages of lodash
joehan Jan 28, 2021
9e0e6e9
moving function prompts into their own file
joehan Jan 28, 2021
2a3b547
seperating out a bunch of code from functionsDeployHelper
joehan Jan 28, 2021
51f2395
Resolves merge conflicts
joehan Jan 28, 2021
30cc0e9
refactoring release step of functions deploy to use typescript (#3071)
joehan Feb 1, 2021
6916000
Implements core logic of running function deploys
joehan Feb 1, 2021
3c8d4a0
Typescriptifying prepareFunctionsUpload (#3064)
joehan Feb 1, 2021
11956fa
Implementing createDeploymentPlan (#3081)
joehan Feb 1, 2021
85d0afe
adding timing and logs for deployments
joehan Feb 2, 2021
00b1989
cleaning up unused code
joehan Feb 2, 2021
397d7c4
Fixing some things that were broken while merging
joehan Feb 3, 2021
21f4906
Fixing up the order of wait and close to ensure that queue promsies a…
joehan Feb 4, 2021
3b3edbd
Format and clean up typos
joehan Feb 4, 2021
e428bcb
refactoring error handling to be cleaner
joehan Feb 5, 2021
4c8e2fb
cleaning up extera newlines
joehan Feb 8, 2021
7f48130
first round of pr fixes
joehan Feb 9, 2021
39a7e86
Readding some changes that I accidenttally wiped out during a merge
joehan Feb 9, 2021
1366955
Switching name to id where appropriate
joehan Feb 9, 2021
7513229
fixing another bug caused by functionName vs Id
joehan Feb 9, 2021
8d3d82d
Merge pull request #3107 from firebase/jh-execute-deployment-plans
joehan Feb 9, 2021
6d2260e
Refactor functions-delete (#3110)
joehan Feb 9, 2021
42e6c15
Cleaning up error reporting
joehan Feb 10, 2021
e4ce126
Merge remote-tracking branch 'public/master' into jh-functions-refactor
joehan Feb 10, 2021
12a48ea
Merge remote-tracking branch 'public/master' into jh-functions-refactor
joehan Feb 11, 2021
7cfe9d9
Implement validation for changing trigger types, and fixes from bug b…
joehan Feb 12, 2021
5eb08bd
Merge branch 'master' into jh-functions-refactor
joehan Feb 12, 2021
5ca6bbf
Merge branch 'master' into jh-functions-refactor
joehan Feb 16, 2021
344b674
fixes package.json
joehan Feb 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
seperating out a bunch of code from functionsDeployHelper
  • Loading branch information
joehan committed Jan 28, 2021
commit 2a3b547811a93baf16b233e3089b8e2c9316bd0a
7 changes: 2 additions & 5 deletions src/deploy/functions/checkIam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ import { bold } from "cli-color";

import { debug } from "../../logger";
import * as track from "../../track";
import {
getReleaseNames,
getFilterGroups,
CloudFunctionTrigger,
} from "../../functionsDeployHelper";
import { getReleaseNames, getFilterGroups } from "../../functionsDeployHelper";
import { CloudFunctionTrigger } from "./deploymentPlanner";
import { FirebaseError } from "../../error";
import { testIamPermissions, testResourceIamPermissions } from "../../gcp/iam";

Expand Down
175 changes: 175 additions & 0 deletions src/deploy/functions/deploymentPlanner.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
import * as deploymentTool from "../../deploymentTool";
import { functionMatchesAnyGroup, getTopicName } from "../../functionsDeployHelper";

export interface CloudFunctionTrigger {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joehan how about CloudFunctionConfig?

name: string;
sourceUploadUrl?: string;
labels: { [key: string]: string };
environmentVariables: { [key: string]: string };
entryPoint: string;
runtime?: string;
vpcConnector?: string;
vpcConnectorEgressSettings?: string;
ingressSettings?: string;
availableMemoryMb?: number;
timeout?: number;
maxInstances?: number;
serviceAccountEmail?: string;
httpsTrigger?: any;
eventTrigger?: any;
failurePolicy?: {};
schedule?: object;
timeZone?: string;
regions?: string[];
}

export interface RegionMap {
[region: string]: CloudFunctionTrigger[];
}

export interface RegionalDeployment {
region: string;
sourceToken?: string;
firstFunctionDeployment?: CloudFunctionTrigger;
functionsToCreate: CloudFunctionTrigger[];
functionsToUpdate: CloudFunctionTrigger[];
schedulesToCreateOrUpdate: CloudFunctionTrigger[];
}

export interface DeploymentPlan {
regionalDeployments: RegionalDeployment[];
functionsToDelete: string[];
schedulesToDelete: string[];
}

/**
* Creates a map of regions to all the CloudFunctions being deployed
* to that region.
* @param projectId The project in use.
* @param parsedTriggers A list of all CloudFunctions in the deployment.
*/
export function createFunctionsByRegionMap(
projectId: string,
parsedTriggers: CloudFunctionTrigger[]
): RegionMap {
const regionMap: RegionMap = {};
for (const trigger of parsedTriggers) {
if (!trigger.regions) {
trigger.regions = ["us-central1"];
}
// Create a separate CloudFunction for
// each region we deploy a function to
for (const region of trigger.regions) {
const triggerDeepCopy = JSON.parse(JSON.stringify(trigger));
if (triggerDeepCopy.regions) {
delete triggerDeepCopy.regions;
}
triggerDeepCopy.name = [
"projects",
projectId,
"locations",
region,
"functions",
trigger.name,
].join("/");
regionMap[region] = regionMap[region] || [];
regionMap[region].push(triggerDeepCopy);
}
}
return regionMap;
}

/**
* Helper method to turn a RegionMap into a flat list of all functions in a deployment.
* @param regionMap A RegionMap for the deployment.
*/
export function flattenRegionMap(regionMap: RegionMap): CloudFunctionTrigger[] {
const triggers: CloudFunctionTrigger[] = [];
for (const [k, v] of Object.entries(regionMap)) {
triggers.push(...v);
}
return triggers;
}

/**
* Create a plan for deploying all functions in one region.
* @param region The region of this deployment
* @param functionsInSourceByRegion The functions present in the code currently being deployed.
* @param existingFunctionNames The names of all functions that already exist.
* @param existingScheduledFunctionNames The names of all schedules functions that already exist.
* @param filters The filters, passed in by the user via `--only functions:`
*/
export function createDeploymentPlan(
functionsInSourceByRegion: RegionMap,
existingFunctions: CloudFunctionTrigger[],
filters: string[][]
): DeploymentPlan {
const deployment: DeploymentPlan = {
regionalDeployments: [],
functionsToDelete: [],
schedulesToDelete: [],
};
// eslint-disable-next-line guard-for-in
for (const region in functionsInSourceByRegion) {
const regionalDeployment: RegionalDeployment = {
region,
functionsToCreate: [],
functionsToUpdate: [],
schedulesToCreateOrUpdate: [],
};
const localFunctionsInRegion = functionsInSourceByRegion[region];
for (const fn of localFunctionsInRegion) {
// Check if this function matches the --only filters
if (functionMatchesAnyGroup(fn.name, filters)) {
// Check if this local function has the same name as an exisiting one.
const matchingExistingFunction = existingFunctions.find((exFn) => {
return exFn.name === fn.name;
});
// Check if the matching exisitng function is scheduled
const isMatchingExisitingFnScheduled =
matchingExistingFunction?.labels?.["deployment-scheduled"] === "true";
// Check if the local function is a scheduled function
if (fn.schedule) {
// If the local function is scheduled, set its trigger to the correct pubsub topic
fn.eventTrigger.resource = getTopicName(fn.name);
// and create or update a schedule.
regionalDeployment.schedulesToCreateOrUpdate.push(fn);
} else if (isMatchingExisitingFnScheduled) {
// If the local function isn't scheduled but the existing one is, delete the schedule.
deployment.schedulesToDelete.push(matchingExistingFunction!.name);
}

if (!matchingExistingFunction) {
regionalDeployment.functionsToCreate.push(fn);
} else {
regionalDeployment.functionsToUpdate.push(fn);
existingFunctions = existingFunctions.filter((exFn: CloudFunctionTrigger) => {
return exFn.name !== fn.name;
});
}
}
}
deployment.regionalDeployments.push(regionalDeployment);
}

// Delete any remaining existing functions that:
// 1 - Have the deployment-tool: 'firebase-cli' label and
// 2 - Match the --only filters, if any are provided.
const functionsToDelete = existingFunctions
.filter((fn) => {
return deploymentTool.check(fn.labels);
})
.filter((fn) => {
return filters.length ? functionMatchesAnyGroup(fn.name, filters) : true;
});
deployment.functionsToDelete = functionsToDelete.map((fn) => {
return fn.name;
});
// Also delete any schedules for functions that we are deleting.
for (const fn of functionsToDelete) {
if (fn.labels?.["deployment-scheduled"] === "true") {
deployment.schedulesToDelete.push(fn.name);
}
}
return deployment;
}
5 changes: 2 additions & 3 deletions src/deploy/functions/prepare.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import * as functionsConfig from "../../functionsConfig";
import * as getProjectId from "../../getProjectId";
import { logBullet } from "../../utils";
import { getRuntimeChoice } from "../../parseRuntimeAndValidateSDK";
import { functionMatchesAnyGroup, getFilterGroups } from "../../functionsDeployHelper";
import {
CloudFunctionTrigger,
createFunctionsByRegionMap,
flattenRegionMap,
functionMatchesAnyGroup,
getFilterGroups,
} from "../../functionsDeployHelper";
} from "./deploymentPlanner";
import { promptForFailurePolicies } from "./prompts";
import * as prepareFunctionsUpload from "../../prepareFunctionsUpload";
import * as validate from "./validate";
Expand Down
7 changes: 4 additions & 3 deletions src/deploy/functions/prompts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as clc from "cli-color";

import { CloudFunctionTrigger, getFunctionLabel } from "../../functionsDeployHelper";
import { getFunctionLabel } from "../../functionsDeployHelper";
import { CloudFunctionTrigger } from "./deploymentPlanner";
import { FirebaseError } from "../../error";
import { promptOnce } from "../../prompt";
import * as utils from "../../utils";
Expand All @@ -22,7 +23,7 @@ export async function promptForFailurePolicies(

if (failurePolicyFunctions.length) {
const failurePolicyFunctionLabels = failurePolicyFunctions.map((fn: CloudFunctionTrigger) => {
return getFunctionLabel(_.get(fn, "name"));
return getFunctionLabel(fn.name);
});
const retryMessage =
"The following functions will be retried in case of failure: " +
Expand All @@ -49,4 +50,4 @@ export async function promptForFailurePolicies(
}
}
}
}
}
5 changes: 3 additions & 2 deletions src/deploy/functions/release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import * as deploymentTool from "../../deploymentTool";
import * as track from "../../track";
import * as utils from "../../utils";
import * as helper from "../../functionsDeployHelper";
import { CloudFunctionTrigger } from "./deploymentPlanner";
import { FirebaseError } from "../../error";
import { getHumanFriendlyRuntimeName } from "../../parseRuntimeAndValidateSDK";
import { getAppEngineLocation } from "../../functionsConfig";
Expand Down Expand Up @@ -145,7 +146,7 @@ export async function release(context: any, options: any, payload: any): Promise

const appEngineLocation = getAppEngineLocation(context.firebaseConfig);
let functionsInfo = payload.functions.triggers;
functionsInfo = functionsInfo.map((fn: helper.CloudFunctionTrigger) => {
functionsInfo = functionsInfo.map((fn: CloudFunctionTrigger) => {
if (
fn.eventTrigger &&
fn.schedule &&
Expand Down Expand Up @@ -427,7 +428,7 @@ export async function release(context: any, options: any, payload: any): Promise
}
}
// filter out functions that are excluded via --only and --except flags
const functionsInDeploy = functionsInfo.filter((trigger: helper.CloudFunctionTrigger) => {
const functionsInDeploy = functionsInfo.filter((trigger: CloudFunctionTrigger) => {
return functionFilterGroups.length > 0 ? _.includes(deleteReleaseNames, trigger.name) : true;
});
await createOrUpdateSchedulesAndTopics(
Expand Down