firebase-tools 15.34.2 → 15.36.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api.js +2 -4
- package/lib/appcheck/debugTokens.js +293 -0
- package/lib/appcheck/localConfig.js +191 -0
- package/lib/appdistribution/options-parser-util.js +1 -1
- package/lib/apphosting/constants.js +1 -4
- package/lib/apphosting/githubConnections.js +1 -1
- package/lib/apphosting/utils.js +0 -26
- package/lib/auth.js +8 -2
- package/lib/commands/appcheck-debugtokens-create.js +60 -35
- package/lib/commands/appcheck-debugtokens-delete.js +21 -7
- package/lib/commands/appcheck-debugtokens-list.js +37 -8
- package/lib/commands/appcheck-debugtokens-prune.js +59 -0
- package/lib/commands/crashlytics-heapdumps-status.js +1 -1
- package/lib/commands/{crashlytics-onboard-web.js → crashlytics-setup.js} +5 -5
- package/lib/commands/crashlytics-sourcemap-upload.js +4 -0
- package/lib/commands/deploy.js +1 -3
- package/lib/commands/emulators-start.js +2 -2
- package/lib/commands/hosting-channel-create.js +1 -3
- package/lib/commands/hosting-channel-delete.js +1 -3
- package/lib/commands/hosting-channel-deploy.js +1 -3
- package/lib/commands/hosting-channel-list.js +1 -3
- package/lib/commands/hosting-channel-open.js +1 -3
- package/lib/commands/hosting-clone.js +3 -5
- package/lib/commands/hosting-disable.js +2 -2
- package/lib/commands/hosting-sites-create.js +1 -3
- package/lib/commands/hosting-sites-delete.js +1 -3
- package/lib/commands/hosting-sites-get.js +1 -3
- package/lib/commands/hosting-sites-list.js +1 -3
- package/lib/commands/index.js +4 -2
- package/lib/commands/run-services-get.js +19 -0
- package/lib/commands/run-services-list.js +11 -0
- package/lib/crashlytics/alerts.js +1 -0
- package/lib/crashlytics/events.js +122 -1
- package/lib/crashlytics/filters.js +12 -6
- package/lib/crashlytics/firebasetelemetry.js +5 -3
- package/lib/crashlytics/onboarding.js +8 -7
- package/lib/crashlytics/profilingManager.js +14 -34
- package/lib/crashlytics/reports.js +46 -17
- package/lib/crashlytics/sourcemap.js +19 -5
- package/lib/crashlytics/utils.js +14 -0
- package/lib/database/import.js +5 -4
- package/lib/dataconnect/dataplaneClient.js +0 -10
- package/lib/dataconnect/names.js +3 -3
- package/lib/dataconnect/schemaMigration.js +1 -1
- package/lib/deploy/apphosting/deploy.js +20 -41
- package/lib/deploy/apphosting/localBuild.js +49 -0
- package/lib/deploy/apphosting/prepare.js +12 -25
- package/lib/deploy/apphosting/release.js +1 -1
- package/lib/deploy/apphosting/util.js +27 -4
- package/lib/deploy/functions/backend.js +0 -10
- package/lib/deploy/functions/cel.js +1 -1
- package/lib/deploy/functions/containerCleaner.js +1 -142
- package/lib/deploy/functions/functionsDeployHelper.js +0 -4
- package/lib/deploy/functions/release/reporter.js +0 -26
- package/lib/deploy/functions/runtimes/discovery/index.js +4 -1
- package/lib/deploy/functions/runtimes/discovery/v1alpha1.js +1 -1
- package/lib/deploy/functions/services/index.js +13 -11
- package/lib/deploy/functions/validate.js +1 -1
- package/lib/deploy/hosting/prepare.js +1 -3
- package/lib/deploy/lifecycleHooks.js +1 -1
- package/lib/deploy/run/deploy.js +26 -43
- package/lib/deploy/run/get.js +30 -0
- package/lib/deploy/run/list.js +38 -0
- package/lib/deploy/run/prereqs.js +0 -3
- package/lib/deploy/run/util.js +9 -0
- package/lib/emulator/auth/operations.js +2 -2
- package/lib/emulator/auth/server.js +4 -2
- package/lib/emulator/auth/widget_ui.js +1 -1
- package/lib/emulator/commandUtils.js +109 -24
- package/lib/emulator/databaseEmulator.js +16 -11
- package/lib/emulator/dataconnect/pgliteServer.js +31 -24
- package/lib/emulator/downloadableEmulatorInfo.json +24 -24
- package/lib/emulator/downloadableEmulators.js +45 -7
- package/lib/emulator/extensions/postinstall.js +6 -6
- package/lib/emulator/firestoreEmulator.js +21 -15
- package/lib/emulator/functionsEmulator.js +11 -7
- package/lib/emulator/functionsEmulatorRuntime.js +7 -2
- package/lib/emulator/hub.js +12 -8
- package/lib/emulator/shared/express.js +30 -0
- package/lib/emulator/storage/apis/firebase.js +11 -10
- package/lib/emulator/storage/apis/gcloud.js +21 -20
- package/lib/emulator/storage/files.js +1 -1
- package/lib/emulator/storage/rules/manager.js +15 -12
- package/lib/emulator/storage/rules/runtime.js +1 -0
- package/lib/emulator/storage/server.js +10 -5
- package/lib/extensions/extensionsApi.js +0 -8
- package/lib/extensions/extensionsHelper.js +3 -24
- package/lib/extensions/paramHelper.js +1 -1
- package/lib/extensions/provisioningHelper.js +1 -6
- package/lib/extensions/secretsUtils.js +0 -24
- package/lib/firestore/util.js +3 -3
- package/lib/frameworks/angular/utils.js +1 -1
- package/lib/frameworks/next/utils.js +1 -12
- package/lib/fsAsync.js +34 -20
- package/lib/functions/kits/install.js +233 -628
- package/lib/functions/kits/sources/directory.js +91 -0
- package/lib/functions/kits/sources/npm.js +324 -0
- package/lib/functions/kits/sources/types.js +12 -0
- package/lib/functionsConfig.js +0 -4
- package/lib/functionsShellCommandAction.js +1 -1
- package/lib/gcp/artifactregistry.js +0 -5
- package/lib/gcp/cloudfunctionsv2.js +0 -6
- package/lib/gcp/devConnect.js +2 -2
- package/lib/gcp/iam.js +0 -4
- package/lib/gcp/pubsub.js +0 -14
- package/lib/gcp/storage.js +2 -1
- package/lib/hosting/api.js +79 -0
- package/lib/hosting/proxy.js +4 -1
- package/lib/init/features/hosting/github.js +6 -4
- package/lib/init/features/hosting/index.js +4 -0
- package/lib/init/features/run.js +3 -7
- package/lib/mcp/apps/init/mcp-app.js +4 -1
- package/lib/mcp/index.js +8 -2
- package/lib/mcp/prompts/apptesting/run_test.js +3 -3
- package/lib/mcp/prompts/core/deploy.js +3 -3
- package/lib/mcp/resources/guides/crashlytics_reports.js +33 -71
- package/lib/mcp/resources/guides/init_ai.js +10 -10
- package/lib/mcp/tools/crashlytics/events.js +18 -93
- package/lib/mcp/tools/crashlytics/index.js +2 -0
- package/lib/mcp/tools/crashlytics/reports.js +26 -31
- package/lib/mcp/tools/crashlytics/setup.js +392 -0
- package/lib/tsconfig.compile.tsbuildinfo +1 -1
- package/lib/tsconfig.publish.tsbuildinfo +1 -1
- package/lib/utils.js +4 -10
- package/package.json +1 -2
- package/lib/deploy/hosting/args.js +0 -2
|
@@ -4,7 +4,6 @@ exports.AbortedDeploymentError = exports.DeploymentError = void 0;
|
|
|
4
4
|
exports.logAndTrackDeployStats = logAndTrackDeployStats;
|
|
5
5
|
exports.printErrors = printErrors;
|
|
6
6
|
exports.printAbortedErrors = printAbortedErrors;
|
|
7
|
-
exports.triggerTag = triggerTag;
|
|
8
7
|
const backend = require("../backend");
|
|
9
8
|
const clc = require("colorette");
|
|
10
9
|
const logger_1 = require("../../../logger");
|
|
@@ -170,28 +169,3 @@ function printAbortedErrors(results) {
|
|
|
170
169
|
aborted.map((result) => `\n\t${(0, functionsDeployHelper_1.getFunctionLabel)(result.endpoint)}`).join(""));
|
|
171
170
|
logger_1.logger.info(`To delete these, use ${clc.bold("firebase functions:delete")}`);
|
|
172
171
|
}
|
|
173
|
-
function triggerTag(endpoint) {
|
|
174
|
-
const prefix = endpoint.platform === "gcfv1" ? "v1" : "v2";
|
|
175
|
-
if (backend.isScheduleTriggered(endpoint)) {
|
|
176
|
-
return `${prefix}.scheduled`;
|
|
177
|
-
}
|
|
178
|
-
if (backend.isTaskQueueTriggered(endpoint)) {
|
|
179
|
-
return `${prefix}.taskQueue`;
|
|
180
|
-
}
|
|
181
|
-
if (backend.isCallableTriggered(endpoint)) {
|
|
182
|
-
return `${prefix}.callable`;
|
|
183
|
-
}
|
|
184
|
-
if (backend.isHttpsTriggered(endpoint)) {
|
|
185
|
-
if (endpoint.labels?.["deployment-callable"]) {
|
|
186
|
-
return `${prefix}.callable`;
|
|
187
|
-
}
|
|
188
|
-
return `${prefix}.https`;
|
|
189
|
-
}
|
|
190
|
-
if (backend.isDataConnectGraphqlTriggered(endpoint)) {
|
|
191
|
-
return `${prefix}.dataConnectGraphql`;
|
|
192
|
-
}
|
|
193
|
-
if (backend.isBlockingTriggered(endpoint)) {
|
|
194
|
-
return `${prefix}.blocking`;
|
|
195
|
-
}
|
|
196
|
-
return endpoint.eventTrigger.eventType;
|
|
197
|
-
}
|
|
@@ -109,7 +109,7 @@ async function detectFromOutputPath(childProcess, manifestPath, project, runtime
|
|
|
109
109
|
childProcess.stderr?.on("data", (chunk) => {
|
|
110
110
|
stderrBuffer += chunk.toString();
|
|
111
111
|
});
|
|
112
|
-
|
|
112
|
+
const onExit = async (code) => {
|
|
113
113
|
if (!resolved) {
|
|
114
114
|
clearTimeout(timer);
|
|
115
115
|
resolved = true;
|
|
@@ -133,6 +133,9 @@ async function detectFromOutputPath(childProcess, manifestPath, project, runtime
|
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
|
+
};
|
|
137
|
+
childProcess.on("exit", (code) => {
|
|
138
|
+
void onExit(code);
|
|
136
139
|
});
|
|
137
140
|
childProcess.on("error", (err) => {
|
|
138
141
|
if (!resolved) {
|
|
@@ -80,7 +80,7 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
|
|
|
80
80
|
}
|
|
81
81
|
return bd;
|
|
82
82
|
}
|
|
83
|
-
const ROLE_REGEX = /^(roles\/[a-zA-Z0-9_
|
|
83
|
+
const ROLE_REGEX = /^(roles\/[a-zA-Z0-9_.-]+|projects\/[a-zA-Z0-9-]+\/roles\/[a-zA-Z0-9_.-]+|organizations\/[0-9]+\/roles\/[a-zA-Z0-9_.-]+)$/;
|
|
84
84
|
function parseRequiredRoles(manifest) {
|
|
85
85
|
const roles = manifest.requiredRoles || [];
|
|
86
86
|
for (const role of roles) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FALLBACK_DEPLOYMENT_REGION = exports.DEFAULT_GLOBAL_TRIGGER_REGION = exports.noopProjectBindings = exports.noop = void 0;
|
|
3
|
+
exports.FALLBACK_DEPLOYMENT_REGION = exports.DEFAULT_GLOBAL_TRIGGER_REGION = exports.noopProjectBindings = exports.syncNoop = exports.noop = void 0;
|
|
4
4
|
exports.serviceForEndpoint = serviceForEndpoint;
|
|
5
5
|
const auth_1 = require("./auth");
|
|
6
6
|
const storage_1 = require("./storage");
|
|
@@ -14,6 +14,8 @@ const ailogic_1 = require("./ailogic");
|
|
|
14
14
|
const authEventarc_1 = require("./authEventarc");
|
|
15
15
|
const noop = () => Promise.resolve();
|
|
16
16
|
exports.noop = noop;
|
|
17
|
+
const syncNoop = () => undefined;
|
|
18
|
+
exports.syncNoop = syncNoop;
|
|
17
19
|
const noopProjectBindings = () => Promise.resolve([]);
|
|
18
20
|
exports.noopProjectBindings = noopProjectBindings;
|
|
19
21
|
exports.DEFAULT_GLOBAL_TRIGGER_REGION = "us-east1";
|
|
@@ -22,7 +24,7 @@ const noOpService = {
|
|
|
22
24
|
name: "noop",
|
|
23
25
|
api: "",
|
|
24
26
|
ensureTriggerRegion: exports.noop,
|
|
25
|
-
validateTrigger: exports.
|
|
27
|
+
validateTrigger: exports.syncNoop,
|
|
26
28
|
registerTrigger: exports.noop,
|
|
27
29
|
unregisterTrigger: exports.noop,
|
|
28
30
|
getDefaultRegion: () => Promise.resolve(exports.FALLBACK_DEPLOYMENT_REGION),
|
|
@@ -32,7 +34,7 @@ const pubSubService = {
|
|
|
32
34
|
api: "pubsub.googleapis.com",
|
|
33
35
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
34
36
|
ensureTriggerRegion: exports.noop,
|
|
35
|
-
validateTrigger: exports.
|
|
37
|
+
validateTrigger: exports.syncNoop,
|
|
36
38
|
registerTrigger: exports.noop,
|
|
37
39
|
unregisterTrigger: exports.noop,
|
|
38
40
|
getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
|
|
@@ -42,7 +44,7 @@ const storageService = {
|
|
|
42
44
|
api: "storage.googleapis.com",
|
|
43
45
|
requiredProjectBindings: storage_1.obtainStorageBindings,
|
|
44
46
|
ensureTriggerRegion: storage_1.ensureStorageTriggerRegion,
|
|
45
|
-
validateTrigger: exports.
|
|
47
|
+
validateTrigger: exports.syncNoop,
|
|
46
48
|
registerTrigger: exports.noop,
|
|
47
49
|
unregisterTrigger: exports.noop,
|
|
48
50
|
getDefaultRegion: storage_1.getDefaultRegion,
|
|
@@ -52,7 +54,7 @@ const firebaseAlertsService = {
|
|
|
52
54
|
api: "firebasealerts.googleapis.com",
|
|
53
55
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
54
56
|
ensureTriggerRegion: firebaseAlerts_1.ensureFirebaseAlertsTriggerRegion,
|
|
55
|
-
validateTrigger: exports.
|
|
57
|
+
validateTrigger: exports.syncNoop,
|
|
56
58
|
registerTrigger: exports.noop,
|
|
57
59
|
unregisterTrigger: exports.noop,
|
|
58
60
|
getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
|
|
@@ -64,7 +66,7 @@ const databaseService = {
|
|
|
64
66
|
api: "firebasedatabase.googleapis.com",
|
|
65
67
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
66
68
|
ensureTriggerRegion: database_1.ensureDatabaseTriggerRegion,
|
|
67
|
-
validateTrigger: exports.
|
|
69
|
+
validateTrigger: exports.syncNoop,
|
|
68
70
|
registerTrigger: exports.noop,
|
|
69
71
|
unregisterTrigger: exports.noop,
|
|
70
72
|
getDefaultRegion: database_1.getDefaultRegion,
|
|
@@ -74,7 +76,7 @@ const remoteConfigService = {
|
|
|
74
76
|
api: "firebaseremoteconfig.googleapis.com",
|
|
75
77
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
76
78
|
ensureTriggerRegion: remoteConfig_1.ensureRemoteConfigTriggerRegion,
|
|
77
|
-
validateTrigger: exports.
|
|
79
|
+
validateTrigger: exports.syncNoop,
|
|
78
80
|
registerTrigger: exports.noop,
|
|
79
81
|
unregisterTrigger: exports.noop,
|
|
80
82
|
getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
|
|
@@ -84,7 +86,7 @@ const testLabService = {
|
|
|
84
86
|
api: "testing.googleapis.com",
|
|
85
87
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
86
88
|
ensureTriggerRegion: testLab_1.ensureTestLabTriggerRegion,
|
|
87
|
-
validateTrigger: exports.
|
|
89
|
+
validateTrigger: exports.syncNoop,
|
|
88
90
|
registerTrigger: exports.noop,
|
|
89
91
|
unregisterTrigger: exports.noop,
|
|
90
92
|
getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
|
|
@@ -94,7 +96,7 @@ const firestoreService = {
|
|
|
94
96
|
api: "firestore.googleapis.com",
|
|
95
97
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
96
98
|
ensureTriggerRegion: firestore_1.ensureFirestoreTriggerRegion,
|
|
97
|
-
validateTrigger: exports.
|
|
99
|
+
validateTrigger: exports.syncNoop,
|
|
98
100
|
registerTrigger: exports.noop,
|
|
99
101
|
unregisterTrigger: exports.noop,
|
|
100
102
|
getDefaultRegion: firestore_1.getDefaultRegion,
|
|
@@ -104,7 +106,7 @@ const dataconnectService = {
|
|
|
104
106
|
api: "firebasedataconnect.googleapis.com",
|
|
105
107
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
106
108
|
ensureTriggerRegion: dataconnect_1.ensureDataConnectTriggerRegion,
|
|
107
|
-
validateTrigger: exports.
|
|
109
|
+
validateTrigger: exports.syncNoop,
|
|
108
110
|
registerTrigger: exports.noop,
|
|
109
111
|
unregisterTrigger: exports.noop,
|
|
110
112
|
getDefaultRegion: dataconnect_1.getDefaultRegion,
|
|
@@ -114,7 +116,7 @@ const authEventarcService = {
|
|
|
114
116
|
api: "eventarc.googleapis.com",
|
|
115
117
|
requiredProjectBindings: exports.noopProjectBindings,
|
|
116
118
|
ensureTriggerRegion: authEventarc_1.ensureAuthEventarcTriggerRegion,
|
|
117
|
-
validateTrigger: exports.
|
|
119
|
+
validateTrigger: exports.syncNoop,
|
|
118
120
|
registerTrigger: exports.noop,
|
|
119
121
|
unregisterTrigger: exports.noop,
|
|
120
122
|
getDefaultRegion: () => Promise.resolve(exports.DEFAULT_GLOBAL_TRIGGER_REGION),
|
|
@@ -229,7 +229,7 @@ function functionIdsAreValid(functions) {
|
|
|
229
229
|
const invalidIds = functions.filter((fn) => !functionName.test(fn.id));
|
|
230
230
|
if (invalidIds.length !== 0) {
|
|
231
231
|
const msg = `${invalidIds.map((f) => f.id).join(", ")} function name(s) can only contain letters, ` +
|
|
232
|
-
`numbers, hyphens, and not exceed
|
|
232
|
+
`numbers, underscores, hyphens, and not exceed 63 characters in length`;
|
|
233
233
|
throw new error_1.FirebaseError(msg);
|
|
234
234
|
}
|
|
235
235
|
}
|
|
@@ -15,8 +15,6 @@ const utils = require("../../utils");
|
|
|
15
15
|
const backend = require("../functions/backend");
|
|
16
16
|
const ensureTargeted_1 = require("../../functions/ensureTargeted");
|
|
17
17
|
const frameworks_1 = require("../../frameworks");
|
|
18
|
-
const ensureApiEnabled_1 = require("../../ensureApiEnabled");
|
|
19
|
-
const api_1 = require("../../api");
|
|
20
18
|
function handlePublicDirectoryFlag(options) {
|
|
21
19
|
if (options.public) {
|
|
22
20
|
if (Array.isArray(options.config.get("hosting"))) {
|
|
@@ -75,7 +73,7 @@ async function prepare(context, options) {
|
|
|
75
73
|
if (configs.length === 0) {
|
|
76
74
|
return Promise.resolve();
|
|
77
75
|
}
|
|
78
|
-
await
|
|
76
|
+
await api.ensureApiEnabled(context.projectId);
|
|
79
77
|
const versions = await Promise.all(configs.map(async (config) => {
|
|
80
78
|
await api.getSite(context.projectId, config.site);
|
|
81
79
|
const labels = {
|
|
@@ -10,7 +10,7 @@ const logger_1 = require("../logger");
|
|
|
10
10
|
const path = require("path");
|
|
11
11
|
const vsCodeUtils_1 = require("../vsCodeUtils");
|
|
12
12
|
function runCommand(command, childOptions) {
|
|
13
|
-
const escapedCommand = command.replace(
|
|
13
|
+
const escapedCommand = command.replace(/"/g, '\\"');
|
|
14
14
|
const nodeExecutable = (0, vsCodeUtils_1.isVSCodeExtension)() ? "node" : process.execPath;
|
|
15
15
|
const crossEnvShellPath = (0, vsCodeUtils_1.isVSCodeExtension)()
|
|
16
16
|
? path.resolve(__dirname, "./cross-env/dist/bin/cross-env-shell.js")
|
package/lib/deploy/run/deploy.js
CHANGED
|
@@ -6,16 +6,14 @@ exports.localBuildTemplate = localBuildTemplate;
|
|
|
6
6
|
const fs = require("fs");
|
|
7
7
|
const os = require("os");
|
|
8
8
|
const path = require("path");
|
|
9
|
-
const constants_1 = require("../../apphosting/constants");
|
|
10
9
|
const localbuilds_1 = require("../../apphosting/localbuilds");
|
|
11
10
|
const error_1 = require("../../error");
|
|
12
11
|
const artifactregistry = require("../../gcp/artifactregistry");
|
|
13
12
|
const runv2 = require("../../gcp/runv2");
|
|
14
13
|
const gcs = require("../../gcp/storage");
|
|
15
14
|
const getProjectNumber_1 = require("../../getProjectNumber");
|
|
16
|
-
const logger_1 = require("../../logger");
|
|
17
15
|
const utils_1 = require("../../utils");
|
|
18
|
-
const
|
|
16
|
+
const localBuild_1 = require("../apphosting/localBuild");
|
|
19
17
|
const util_1 = require("../apphosting/util");
|
|
20
18
|
const buildEnv_1 = require("./buildEnv");
|
|
21
19
|
const util_2 = require("./util");
|
|
@@ -34,26 +32,22 @@ async function deploy(context, options, payload) {
|
|
|
34
32
|
}
|
|
35
33
|
async function deployRemoteBuild(context, options, svc) {
|
|
36
34
|
const { projectId } = context;
|
|
37
|
-
const
|
|
38
|
-
const
|
|
35
|
+
const { buildFolder, appFolder } = (0, util_1.buildDirectory)(options.config.projectDir, svc.config.rootDir);
|
|
36
|
+
const archive = await (0, util_1.createSourceDeployArchive)(toAppHostingConfig(svc.config), buildFolder, options.config.projectDir);
|
|
37
|
+
const source = await upload(projectId, options, svc.config, archive);
|
|
38
|
+
const image = await buildImage(projectId, svc, source, appFolder);
|
|
39
39
|
const template = revisionTemplate(svc, image, options.message);
|
|
40
40
|
svc.deployed = await rollOut(projectId, svc, template);
|
|
41
41
|
}
|
|
42
42
|
async function deployLocalBuild(context, options, svc) {
|
|
43
43
|
const { projectId } = context;
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
const template = localBuildTemplate(svc, build, builtApp, message);
|
|
50
|
-
svc.deployed = await rollOut(projectId, svc, template);
|
|
51
|
-
}
|
|
52
|
-
finally {
|
|
53
|
-
removeTempPath(scratchDir);
|
|
54
|
-
}
|
|
44
|
+
const build = await buildServiceLocally(context, options, svc);
|
|
45
|
+
const builtApp = await upload(projectId, options, svc.config, build.archive);
|
|
46
|
+
const message = options.message;
|
|
47
|
+
const template = localBuildTemplate(svc, build, builtApp, message);
|
|
48
|
+
svc.deployed = await rollOut(projectId, svc, template);
|
|
55
49
|
}
|
|
56
|
-
async function
|
|
50
|
+
async function buildServiceLocally(context, options, svc) {
|
|
57
51
|
const { config } = svc;
|
|
58
52
|
const { serviceId, region } = config;
|
|
59
53
|
const cfg = toAppHostingConfig(config);
|
|
@@ -64,31 +58,27 @@ async function buildLocally(context, options, svc, scratchDir) {
|
|
|
64
58
|
(0, utils_1.logLabeledBullet)("run", `Reading build secrets ${secrets.join(", ")} with your credentials. Their values may be ` +
|
|
65
59
|
`included in the build output.`);
|
|
66
60
|
}
|
|
67
|
-
await (0,
|
|
68
|
-
|
|
61
|
+
const { archive, buildConfig } = await (0, localBuild_1.buildLocally)({
|
|
62
|
+
projectId: context.projectId,
|
|
63
|
+
projectDir: options.config.projectDir,
|
|
64
|
+
config: cfg,
|
|
65
|
+
env: (0, buildEnv_1.toLocalBuildEnv)(svc.buildEnv || {}),
|
|
66
|
+
scratchDir: fs.mkdtempSync(path.join(os.tmpdir(), `run-local-build-${serviceId}-`)),
|
|
67
|
+
allowLocalBuildSecrets: true,
|
|
68
|
+
});
|
|
69
69
|
const env = (buildConfig.env || [])
|
|
70
70
|
.filter((e) => e.variable &&
|
|
71
71
|
e.value !== undefined &&
|
|
72
72
|
(!e.availability || e.availability.includes("RUNTIME")))
|
|
73
73
|
.map((e) => ({ name: e.variable, value: e.value }));
|
|
74
|
-
return {
|
|
74
|
+
return { archive, runCommand: buildConfig.runCommand, env };
|
|
75
75
|
}
|
|
76
|
-
async function
|
|
76
|
+
async function upload(projectId, options, config, archive) {
|
|
77
77
|
const { serviceId, region } = config;
|
|
78
78
|
const bucketName = await sourceBucket(projectId, options, region);
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
(0,
|
|
82
|
-
const { bucket, object } = await gcs.uploadObject({ file: archive, stream: fs.createReadStream(archive) }, bucketName, gcs.ContentType.ZIP);
|
|
83
|
-
return { bucket, object };
|
|
84
|
-
}
|
|
85
|
-
async function uploadBuiltApp(projectId, options, config, scratchDir, build) {
|
|
86
|
-
const { serviceId, region } = config;
|
|
87
|
-
const bucketName = await sourceBucket(projectId, options, region);
|
|
88
|
-
const archive = await (0, util_1.createLocalBuildTarArchive)(toAppHostingConfig(config), scratchDir, build.outputFiles);
|
|
89
|
-
(0, utils_1.logLabeledBullet)("run", `Uploading built app for service ${serviceId} in ${region}...`);
|
|
90
|
-
const { bucket, object } = await gcs.uploadObject({ file: archive, stream: fs.createReadStream(archive) }, bucketName, gcs.ContentType.TAR, constants_1.CLOUD_RUN_SIZE_LIMIT_BYTES);
|
|
91
|
-
return { bucket, object };
|
|
79
|
+
const what = config.localBuild ? "built app" : "source";
|
|
80
|
+
(0, utils_1.logLabeledBullet)("run", `Uploading ${what} for service ${serviceId} in ${region}...`);
|
|
81
|
+
return (0, util_1.uploadArchive)(archive, bucketName, !!config.localBuild);
|
|
92
82
|
}
|
|
93
83
|
async function sourceBucket(projectId, options, region) {
|
|
94
84
|
const baseName = `firebase-run-src-${await (0, getProjectNumber_1.getProjectNumber)(options)}-${region.toLowerCase()}`;
|
|
@@ -104,13 +94,14 @@ async function sourceBucket(projectId, options, region) {
|
|
|
104
94
|
},
|
|
105
95
|
});
|
|
106
96
|
}
|
|
107
|
-
async function buildImage(projectId, svc, source) {
|
|
97
|
+
async function buildImage(projectId, svc, source, appFolder) {
|
|
108
98
|
const { serviceId, region } = svc.config;
|
|
109
99
|
await artifactregistry.ensureDockerRepository(projectId, region, "cloud-run-source-deploy");
|
|
110
100
|
const imageUri = `${region}-docker.pkg.dev/${projectId}/cloud-run-source-deploy/${serviceId}:${Date.now()}`;
|
|
111
101
|
(0, utils_1.logLabeledBullet)("run", `Building service ${serviceId} in ${region}...`);
|
|
112
102
|
const buildpackBuild = {
|
|
113
103
|
environmentVariables: {
|
|
104
|
+
...(appFolder ? { GOOGLE_BUILDABLE: appFolder } : {}),
|
|
114
105
|
...(0, buildEnv_1.nonSecretValues)(svc.buildEnv || {}),
|
|
115
106
|
X_GOOGLE_TARGET_PLATFORM: "fah",
|
|
116
107
|
FIREBASE_OUTPUT_BUNDLE_DIR: "/workspace/.apphosting",
|
|
@@ -232,11 +223,3 @@ function toAppHostingConfig(config) {
|
|
|
232
223
|
localBuild: config.localBuild,
|
|
233
224
|
};
|
|
234
225
|
}
|
|
235
|
-
function removeTempPath(tempPath) {
|
|
236
|
-
try {
|
|
237
|
-
fs.rmSync(tempPath, { recursive: true, force: true });
|
|
238
|
-
}
|
|
239
|
-
catch (err) {
|
|
240
|
-
logger_1.logger.debug(`Failed to clean up ${tempPath}: ${(0, error_1.getErrMsg)(err)}`);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getServiceSpec = getServiceSpec;
|
|
4
|
+
const clc = require("colorette");
|
|
5
|
+
const error_1 = require("../../error");
|
|
6
|
+
const run = require("../../gcp/run");
|
|
7
|
+
const runv2 = require("../../gcp/runv2");
|
|
8
|
+
const util_1 = require("./util");
|
|
9
|
+
async function getServiceSpec(projectId, serviceId, region) {
|
|
10
|
+
let matches = (await runv2.listServices(projectId, false)).filter((s) => {
|
|
11
|
+
const name = (0, util_1.parseServiceName)(s.name);
|
|
12
|
+
return name.serviceId === serviceId && (!region || name.region === region);
|
|
13
|
+
});
|
|
14
|
+
if (matches.length > 1) {
|
|
15
|
+
const unmanaged = matches.filter((s) => !(0, util_1.isManagedByAnotherProduct)(s));
|
|
16
|
+
if (unmanaged.length) {
|
|
17
|
+
matches = unmanaged;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (!matches.length) {
|
|
21
|
+
throw new error_1.FirebaseError(`Cloud Run service ${serviceId} doesn't exist in ${region ?? `project ${projectId}`}. ` +
|
|
22
|
+
`See your services with ${clc.bold("firebase run:services:list")}.`);
|
|
23
|
+
}
|
|
24
|
+
if (matches.length > 1) {
|
|
25
|
+
const regions = matches.map((s) => (0, util_1.parseServiceName)(s.name).region);
|
|
26
|
+
throw new error_1.FirebaseError(`Cloud Run service ${serviceId} exists in more than one region: ${regions.join(", ")}. ` +
|
|
27
|
+
`Choose one with --region.`);
|
|
28
|
+
}
|
|
29
|
+
return run.getService(matches[0].name);
|
|
30
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.listRunServices = listRunServices;
|
|
4
|
+
exports.serviceRows = serviceRows;
|
|
5
|
+
const Table = require("cli-table3");
|
|
6
|
+
const runv2 = require("../../gcp/runv2");
|
|
7
|
+
const logger_1 = require("../../logger");
|
|
8
|
+
const utils_1 = require("../../utils");
|
|
9
|
+
const util_1 = require("./util");
|
|
10
|
+
async function listRunServices(projectId) {
|
|
11
|
+
const allServices = await runv2.listServices(projectId, false);
|
|
12
|
+
const services = allServices.filter((s) => !(0, util_1.isManagedByAnotherProduct)(s));
|
|
13
|
+
if (services.length) {
|
|
14
|
+
const table = new Table({
|
|
15
|
+
head: ["Service ID", "Region", "Base Image"],
|
|
16
|
+
style: { head: ["green"] },
|
|
17
|
+
});
|
|
18
|
+
table.push(...serviceRows(services));
|
|
19
|
+
logger_1.logger.info(table.toString());
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
logger_1.logger.info(`No Cloud Run services found in project ${projectId}.`);
|
|
23
|
+
}
|
|
24
|
+
const skipped = allServices.length - services.length;
|
|
25
|
+
if (skipped) {
|
|
26
|
+
(0, utils_1.logBullet)(`Not listed: ${skipped} ${skipped === 1 ? "service" : "services"} that another product, ` +
|
|
27
|
+
`like Cloud Functions or App Hosting, manages.`);
|
|
28
|
+
}
|
|
29
|
+
return services;
|
|
30
|
+
}
|
|
31
|
+
function serviceRows(services) {
|
|
32
|
+
const rows = services.map((service) => {
|
|
33
|
+
const { serviceId, region } = (0, util_1.parseServiceName)(service.name);
|
|
34
|
+
const baseImage = (0, util_1.mainContainer)(service.template)?.baseImageUri?.split("/").pop();
|
|
35
|
+
return [serviceId, region, baseImage || "None"];
|
|
36
|
+
});
|
|
37
|
+
return rows.sort(([idA, regionA], [idB, regionB]) => idA.localeCompare(idB) || regionA.localeCompare(regionB));
|
|
38
|
+
}
|
|
@@ -12,11 +12,8 @@ exports.RUN_PERMISSIONS = [
|
|
|
12
12
|
"run.operations.get",
|
|
13
13
|
"cloudbuild.builds.create",
|
|
14
14
|
"cloudbuild.builds.get",
|
|
15
|
-
"storage.buckets.get",
|
|
16
15
|
"storage.buckets.list",
|
|
17
16
|
"storage.buckets.create",
|
|
18
|
-
"storage.buckets.update",
|
|
19
|
-
"storage.objects.create",
|
|
20
17
|
"artifactregistry.repositories.get",
|
|
21
18
|
"artifactregistry.repositories.create",
|
|
22
19
|
"artifactregistry.repositories.downloadArtifacts",
|
package/lib/deploy/run/util.js
CHANGED
|
@@ -7,6 +7,8 @@ exports.findServices = findServices;
|
|
|
7
7
|
exports.fullServiceName = fullServiceName;
|
|
8
8
|
exports.getExistingService = getExistingService;
|
|
9
9
|
exports.mainContainer = mainContainer;
|
|
10
|
+
exports.parseServiceName = parseServiceName;
|
|
11
|
+
exports.isManagedByAnotherProduct = isManagedByAnotherProduct;
|
|
10
12
|
const error_1 = require("../../error");
|
|
11
13
|
const runv2 = require("../../gcp/runv2");
|
|
12
14
|
const utils_1 = require("../../utils");
|
|
@@ -73,3 +75,10 @@ async function getExistingService(projectId, region, serviceId) {
|
|
|
73
75
|
function mainContainer(template) {
|
|
74
76
|
return template?.containers?.[0];
|
|
75
77
|
}
|
|
78
|
+
function parseServiceName(name) {
|
|
79
|
+
const parts = name.split("/");
|
|
80
|
+
return { region: parts[3], serviceId: parts[5] };
|
|
81
|
+
}
|
|
82
|
+
function isManagedByAnotherProduct(service) {
|
|
83
|
+
return !!service.labels?.[runv2.CLIENT_NAME_LABEL];
|
|
84
|
+
}
|
|
@@ -165,8 +165,8 @@ async function signUp(state, reqBody, ctx) {
|
|
|
165
165
|
(0, errors_1.assert)(reqBody.password.length >= PASSWORD_MIN_LENGTH, `WEAK_PASSWORD : Password should be at least ${PASSWORD_MIN_LENGTH} characters`);
|
|
166
166
|
updates.salt = "fakeSalt" + (0, utils_1.randomId)(20);
|
|
167
167
|
updates.passwordHash = hashPassword(reqBody.password, updates.salt);
|
|
168
|
-
updates.passwordUpdatedAt =
|
|
169
|
-
updates.validSince = (0, utils_1.toUnixTimestamp)(
|
|
168
|
+
updates.passwordUpdatedAt = timestamp.getTime();
|
|
169
|
+
updates.validSince = (0, utils_1.toUnixTimestamp)(timestamp).toString();
|
|
170
170
|
}
|
|
171
171
|
if (reqBody.mfaInfo) {
|
|
172
172
|
updates.mfaInfo = getMfaEnrollmentsFromRequest(state, reqBody.mfaInfo, {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.specForRouter = specForRouter;
|
|
3
4
|
exports.createApp = createApp;
|
|
4
5
|
const cors = require("cors");
|
|
5
6
|
const express = require("express");
|
|
@@ -79,7 +80,7 @@ function specWithEmulatorServer(protocol, host) {
|
|
|
79
80
|
return result;
|
|
80
81
|
}
|
|
81
82
|
}
|
|
82
|
-
async function createApp(defaultProjectId, singleProjectMode = index_1.SingleProjectMode.NO_WARNING, projectStateForId = new Map()) {
|
|
83
|
+
async function createApp(defaultProjectId, singleProjectMode = index_1.SingleProjectMode.NO_WARNING, projectStateForId = new Map(), options = {}) {
|
|
83
84
|
const app = express();
|
|
84
85
|
app.set("json spaces", 2);
|
|
85
86
|
app.use("/", (req, res, next) => {
|
|
@@ -157,6 +158,7 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
|
|
|
157
158
|
]);
|
|
158
159
|
};
|
|
159
160
|
const apis = await exegesisExpress.middleware(specForRouter(), {
|
|
161
|
+
lazyCompileValidationSchemas: options.lazyCompileValidationSchemas ?? true,
|
|
160
162
|
controllers: { auth: toExegesisController(operations_1.authOperations, getProjectStateById) },
|
|
161
163
|
authenticators: {
|
|
162
164
|
apiKeyQuery: apiKeyAuthenticator,
|
|
@@ -282,7 +284,7 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
|
|
|
282
284
|
const errorString = `Multiple projectIds are not recommended in single project mode. ` +
|
|
283
285
|
`Requested project ID ${projectId}, but the emulator is configured for ` +
|
|
284
286
|
`${defaultProjectId}. To opt-out of single project mode add/set the ` +
|
|
285
|
-
|
|
287
|
+
`'"singleProjectMode"' false' property in the firebase.json emulators config.`;
|
|
286
288
|
emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.AUTH).log("WARN", errorString);
|
|
287
289
|
if (singleProjectMode === index_1.SingleProjectMode.ERROR) {
|
|
288
290
|
throw new errors_2.BadRequestError(errorString);
|
|
@@ -34,7 +34,7 @@ var firebaseAppId = query.get('appId');
|
|
|
34
34
|
var apn = query.get('apn');
|
|
35
35
|
var ibi = query.get('ibi');
|
|
36
36
|
var appIdentifier = apn || ibi;
|
|
37
|
-
var isSamlProvider = !!providerId.match(/^saml
|
|
37
|
+
var isSamlProvider = !!providerId.match(/^saml\\./);
|
|
38
38
|
assert(
|
|
39
39
|
appName || clientId || firebaseAppId || appIdentifier,
|
|
40
40
|
'Missing one of appName / clientId / appId / apn / ibi query params.'
|