-
Notifications
You must be signed in to change notification settings - Fork 230
Functions can now declare dependencies on additional APIs #1900
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
5 commits
Select commit
Hold shift + click to select a range
c357f04
feat: Add requiresAPI support
inlined 8066faa
fix: Enforce template literal type and clear global state
inlined 338761c
test: Reset declared parameters in loader tests
inlined 9b08cea
test: Invalidate CJS require cache between loader tests
inlined a11fa49
style: Auto-format api.ts and add explanatory comment to loader tests
inlined 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 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 +1,2 @@ | ||
| - feat: Add requiresAPI function to allow declaring Google Cloud API dependencies in code. | ||
| - fix(v1): Call onInit for schedule.onRun functions (#1801) |
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { expect } from "chai"; | ||
| import { requiresAPI, getGlobalRequiredAPIs, clearGlobalRequiredAPIs } from "../../src/common/api"; | ||
|
|
||
| describe("requiresAPI", () => { | ||
| afterEach(() => { | ||
| clearGlobalRequiredAPIs(); | ||
| }); | ||
|
|
||
| it("stores required API", () => { | ||
| requiresAPI("test.googleapis.com", "reason"); | ||
| expect(getGlobalRequiredAPIs()).to.deep.equal([ | ||
| { api: "test.googleapis.com", reason: "reason" }, | ||
| ]); | ||
| }); | ||
|
|
||
| it("throws error for invalid API", () => { | ||
| expect(() => requiresAPI("" as any, "reason")).to.throw( | ||
| "requiresAPI: 'api' must be a non-empty string ending with '.googleapis.com'." | ||
| ); | ||
| expect(() => requiresAPI(null as any, "reason")).to.throw( | ||
| "requiresAPI: 'api' must be a non-empty string ending with '.googleapis.com'." | ||
| ); | ||
| expect(() => requiresAPI("invalid-api" as any, "reason")).to.throw( | ||
| "requiresAPI: 'api' must be a non-empty string ending with '.googleapis.com'." | ||
| ); | ||
| }); | ||
| }); |
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 |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| const { requiresAPI } = require("../../../../src/v2"); | ||
| const functions = require("../../../../src/v1"); | ||
|
|
||
| requiresAPI("some-api.googleapis.com", "Needed for some reason"); | ||
|
|
||
| exports.v1http = functions.https.onRequest((req, resp) => { | ||
| resp.status(200).send("PASS"); | ||
| }); |
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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // The MIT License (MIT) | ||
| // | ||
| // Copyright (c) 2024 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 { ManifestRequiredAPI } from "../runtime/manifest"; | ||
|
|
||
| let globalRequiredAPIs: ManifestRequiredAPI[] = []; | ||
|
|
||
| export type GoogleCloudApi = `${string}.googleapis.com`; | ||
|
|
||
| /** | ||
| * Declare that this project requires a specific Google Cloud API to be enabled. | ||
| * @param api The API name, e.g. "secretmanager.googleapis.com" | ||
| * @param reason Optional reason why the API is needed. | ||
| */ | ||
| export function requiresAPI(api: GoogleCloudApi, reason = ""): void { | ||
| if (!api || typeof api !== "string" || !api.endsWith(".googleapis.com")) { | ||
| throw new Error("requiresAPI: 'api' must be a non-empty string ending with '.googleapis.com'."); | ||
| } | ||
| globalRequiredAPIs.push({ api, reason }); | ||
| } | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| export function getGlobalRequiredAPIs(): ManifestRequiredAPI[] { | ||
| return globalRequiredAPIs; | ||
| } | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| export function clearGlobalRequiredAPIs(): void { | ||
| globalRequiredAPIs = []; | ||
| } |
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
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.
Uh oh!
There was an error while loading. Please reload this page.