-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Encapsulate runtime-dependent code #3454
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| import * as proto from "../../gcp/proto"; | ||
| import * as gcf from "../../gcp/cloudfunctions"; | ||
| import * as gcfV2 from "../../gcp/cloudfunctionsv2"; | ||
| import * as cloudscheduler from "../../gcp/cloudscheduler"; | ||
| import * as utils from "../../utils"; | ||
| import * as runtimes from "./runtimes"; | ||
| import { FirebaseError } from "../../error"; | ||
| import { Context } from "./args"; | ||
| import { logger } from "../../logger"; | ||
| import { previews } from "../../previews"; | ||
|
|
||
| /** Retry settings for a ScheduleSpec. */ | ||
|
|
@@ -116,18 +115,6 @@ export function memoryOptionDisplayName(option: MemoryOptions): string { | |
|
|
||
| export const SCHEDULED_FUNCTION_LABEL = Object.freeze({ deployment: "firebase-schedule" }); | ||
|
|
||
| /** Supported runtimes for new Cloud Functions. */ | ||
| export type Runtime = "nodejs10" | "nodejs12" | "nodejs14"; | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. de-duplciated in |
||
|
|
||
| /** Runtimes that can be found in existing backends but not used for new functions. */ | ||
| export type DeprecatedRuntime = "nodejs6" | "nodejs8"; | ||
| const RUNTIMES: string[] = ["nodejs10", "nodejs12", "nodejs14"]; | ||
|
|
||
| /** Type deduction helper for a runtime string. */ | ||
| export function isValidRuntime(runtime: string): runtime is Runtime { | ||
| return RUNTIMES.includes(runtime); | ||
| } | ||
|
|
||
| /** | ||
| * IDs used to identify a regional resource. | ||
| * This type exists so we can have lightweight references from a Pub/Sub topic | ||
|
|
@@ -151,7 +138,7 @@ export interface FunctionSpec extends TargetIds { | |
| apiVersion: FunctionsApiVersion; | ||
| entryPoint: string; | ||
| trigger: HttpsTrigger | EventTrigger; | ||
| runtime: Runtime | DeprecatedRuntime; | ||
| runtime: runtimes.Runtime | runtimes.DeprecatedRuntime; | ||
|
|
||
| labels?: Record<string, string>; | ||
| environmentVariables?: Record<string, string>; | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: This check was redundant with other functions deploy code. It's now in
deploy/functions/runtimes/node/index.ts:Delegate#validate