firebase-tools 15.24.0 → 15.25.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 +4 -2
- package/lib/appcheck/api.js +42 -0
- package/lib/appcheck/prompts.js +41 -0
- package/lib/appcheck/types.js +2 -0
- package/lib/command.js +11 -3
- package/lib/commands/ailogic-config-get.js +75 -0
- package/lib/commands/ailogic-config-set.js +109 -0
- package/lib/commands/ailogic-providers-disable.js +39 -0
- package/lib/commands/ailogic-providers-enable.js +28 -0
- package/lib/commands/ailogic-providers-list.js +29 -0
- package/lib/commands/appcheck-debugtokens-create.js +95 -0
- package/lib/commands/appcheck-debugtokens-delete.js +48 -0
- package/lib/commands/appcheck-debugtokens-list.js +35 -0
- package/lib/commands/apps-sdkconfig.js +2 -23
- package/lib/commands/database-get.js +1 -1
- package/lib/commands/index.js +15 -0
- package/lib/deploy/functions/build.js +93 -3
- package/lib/deploy/functions/params.js +45 -11
- package/lib/deploy/functions/prepare.js +22 -2
- package/lib/deploy/functions/runtimes/node/index.js +8 -7
- package/lib/deploy/functions/runtimes/node/versioning.js +8 -3
- package/lib/deploy/functions/validate.js +5 -2
- package/lib/deploy/hosting/uploader.js +2 -1
- package/lib/emulator/dataconnect/pgliteServer.js +2 -1
- package/lib/emulator/downloadableEmulatorInfo.json +6 -6
- package/lib/emulator/downloadableEmulators.js +1 -0
- package/lib/emulator/hubExport.js +2 -1
- package/lib/emulator/storage/apis/firebase.js +24 -5
- package/lib/emulator/storage/apis/gcloud.js +16 -6
- package/lib/emulator/storage/rules/runtime.js +45 -33
- package/lib/emulator/storage/server.js +2 -5
- package/lib/emulator/storage/upload.js +1 -0
- package/lib/ensureApiEnabled.js +8 -0
- package/lib/experiments.js +16 -0
- package/lib/extensions/warnings.js +64 -0
- package/lib/functions/env.js +22 -2
- package/lib/functions/secrets.js +4 -1
- package/lib/gcp/ailogic.js +165 -1
- package/lib/gcp/cloudfunctionsv2.js +7 -0
- package/lib/gcp/firedata.js +5 -1
- package/lib/gcp/serviceusage.js +26 -0
- package/lib/init/features/ailogic/index.js +3 -29
- package/lib/init/features/database.js +1 -1
- package/lib/management/apps.js +16 -5
- package/lib/mcp/onemcp/onemcp_server.js +28 -9
- package/lib/mcp/tools/core/get_security_rules.js +2 -1
- package/lib/profiler.js +1 -1
- package/lib/streamUtils.js +3 -0
- package/lib/tsconfig.compile.tsbuildinfo +1 -1
- package/lib/tsconfig.publish.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -91,7 +91,7 @@ exports.command = new command_1.Command("database:get <path>")
|
|
|
91
91
|
const fileOut = !!options.output;
|
|
92
92
|
const outStream = fileOut ? fs.createWriteStream(options.output) : process.stdout;
|
|
93
93
|
if (res.status >= 400) {
|
|
94
|
-
const r = await res.
|
|
94
|
+
const r = await utils.streamToString(res.body);
|
|
95
95
|
let d;
|
|
96
96
|
try {
|
|
97
97
|
d = JSON.parse(r);
|
package/lib/commands/index.js
CHANGED
|
@@ -19,6 +19,11 @@ function load(client) {
|
|
|
19
19
|
return runner;
|
|
20
20
|
}
|
|
21
21
|
const t0 = process.hrtime.bigint();
|
|
22
|
+
client.appcheck = {};
|
|
23
|
+
client.appcheck.debugtokens = {};
|
|
24
|
+
client.appcheck.debugtokens.create = loadCommand("appcheck-debugtokens-create");
|
|
25
|
+
client.appcheck.debugtokens.list = loadCommand("appcheck-debugtokens-list");
|
|
26
|
+
client.appcheck.debugtokens.delete = loadCommand("appcheck-debugtokens-delete");
|
|
22
27
|
client.appdistribution = {};
|
|
23
28
|
client.appdistribution.distribute = loadCommand("appdistribution-distribute");
|
|
24
29
|
client.appdistribution.testers = {};
|
|
@@ -214,6 +219,16 @@ function load(client) {
|
|
|
214
219
|
client.apphosting.rollouts.list = loadCommand("apphosting-rollouts-list");
|
|
215
220
|
}
|
|
216
221
|
}
|
|
222
|
+
if (experiments.isEnabled("ailogic")) {
|
|
223
|
+
client.ailogic = {};
|
|
224
|
+
client.ailogic.providers = {};
|
|
225
|
+
client.ailogic.providers.enable = loadCommand("ailogic-providers-enable");
|
|
226
|
+
client.ailogic.providers.disable = loadCommand("ailogic-providers-disable");
|
|
227
|
+
client.ailogic.providers.list = loadCommand("ailogic-providers-list");
|
|
228
|
+
client.ailogic.config = {};
|
|
229
|
+
client.ailogic.config.get = loadCommand("ailogic-config-get");
|
|
230
|
+
client.ailogic.config.set = loadCommand("ailogic-config-set");
|
|
231
|
+
}
|
|
217
232
|
client.login = loadCommand("login");
|
|
218
233
|
client.login.add = loadCommand("login-add");
|
|
219
234
|
client.login.ci = loadCommand("login-ci");
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.REGION_TBD = void 0;
|
|
3
|
+
exports.AllIngressSettings = exports.AllVpcEgressSettings = exports.AllFunctionsPlatforms = exports.SECRET_REF_LONG_RE = exports.SECRET_REF_SHORT_RE = exports.GCP_SECRET_ID_PATTERN = exports.SECRET_REF_PREFIX = exports.REGION_TBD = void 0;
|
|
4
4
|
exports.empty = empty;
|
|
5
5
|
exports.of = of;
|
|
6
6
|
exports.isHttpsTriggered = isHttpsTriggered;
|
|
@@ -14,13 +14,32 @@ exports.resolveBackend = resolveBackend;
|
|
|
14
14
|
exports.envWithTypes = envWithTypes;
|
|
15
15
|
exports.toBackend = toBackend;
|
|
16
16
|
exports.applyPrefix = applyPrefix;
|
|
17
|
+
exports.applyEnvSecretBindings = applyEnvSecretBindings;
|
|
18
|
+
exports.parseSecretRef = parseSecretRef;
|
|
17
19
|
const backend = require("./backend");
|
|
18
20
|
const proto = require("../../gcp/proto");
|
|
19
21
|
const params = require("./params");
|
|
22
|
+
const logger_1 = require("../../logger");
|
|
20
23
|
const error_1 = require("../../error");
|
|
21
24
|
const functional_1 = require("../../functional");
|
|
22
25
|
const cel_1 = require("./cel");
|
|
23
26
|
exports.REGION_TBD = "REGION_TBD";
|
|
27
|
+
exports.SECRET_REF_PREFIX = "FIREBASE_SECRET_REF_";
|
|
28
|
+
const GCP_PROJECT_ID_PATTERN = "([a-z][-a-z0-9]{4,28}[a-z0-9])";
|
|
29
|
+
exports.GCP_SECRET_ID_PATTERN = "([a-zA-Z0-9-_]+)";
|
|
30
|
+
exports.SECRET_REF_SHORT_RE = new RegExp("^" +
|
|
31
|
+
exports.GCP_SECRET_ID_PATTERN +
|
|
32
|
+
"(?:[:#@]" +
|
|
33
|
+
"([a-z0-9-_]+)" +
|
|
34
|
+
")?$");
|
|
35
|
+
exports.SECRET_REF_LONG_RE = new RegExp("^" +
|
|
36
|
+
"projects/" +
|
|
37
|
+
GCP_PROJECT_ID_PATTERN +
|
|
38
|
+
"/secrets/" +
|
|
39
|
+
exports.GCP_SECRET_ID_PATTERN +
|
|
40
|
+
"(?:(?:/versions/|:|#|@)" +
|
|
41
|
+
"([a-z0-9-_]+)" +
|
|
42
|
+
")?$");
|
|
24
43
|
function empty() {
|
|
25
44
|
return {
|
|
26
45
|
requiredAPIs: [],
|
|
@@ -63,8 +82,8 @@ exports.AllIngressSettings = [
|
|
|
63
82
|
"ALLOW_INTERNAL_AND_GCLB",
|
|
64
83
|
];
|
|
65
84
|
async function resolveBackend(opts) {
|
|
66
|
-
const paramValues = await params.resolveParams(opts.build.params, opts.firebaseConfig, envWithTypes(opts.build.params, opts.userEnvs), opts.nonInteractive, opts.isEmulator);
|
|
67
|
-
return { backend: toBackend(opts.build, paramValues), envs: paramValues };
|
|
85
|
+
const { paramValues: paramValues, secretRefs: secretRefs } = await params.resolveParams(opts.build.params, opts.firebaseConfig, envWithTypes(opts.build.params, opts.userEnvs), opts.nonInteractive, opts.isEmulator, opts.force);
|
|
86
|
+
return { backend: toBackend(opts.build, paramValues), envs: paramValues, secretRefs: secretRefs };
|
|
68
87
|
}
|
|
69
88
|
function envWithTypes(definedParams, rawEnvs) {
|
|
70
89
|
const out = {};
|
|
@@ -404,3 +423,74 @@ function applyPrefix(build, prefix) {
|
|
|
404
423
|
}
|
|
405
424
|
}
|
|
406
425
|
}
|
|
426
|
+
function applyEnvSecretBindings(build, envSecrets) {
|
|
427
|
+
if (envSecrets.empty) {
|
|
428
|
+
return;
|
|
429
|
+
}
|
|
430
|
+
logger_1.logger.debug(`Attempting to merge .env secret bindings ${JSON.stringify(envSecrets)} into declared secrets...)}`);
|
|
431
|
+
for (const endpointName of Object.keys(build.endpoints)) {
|
|
432
|
+
logger_1.logger.debug(`${endpointName} declared secrets: ${JSON.stringify(build.endpoints[endpointName].secretEnvironmentVariables)}`);
|
|
433
|
+
}
|
|
434
|
+
for (const key of Object.keys(envSecrets)) {
|
|
435
|
+
const secretRef = envSecrets[key];
|
|
436
|
+
const { projectId, secretId, version } = secretRef;
|
|
437
|
+
for (const param of build.params) {
|
|
438
|
+
if (param.type === "secret" && param.name.toUpperCase() === key) {
|
|
439
|
+
param.resourceId = secretId;
|
|
440
|
+
param.version = version;
|
|
441
|
+
param.inLocalEnvironment = true;
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
for (const endpointName of Object.keys(build.endpoints)) {
|
|
445
|
+
const endpoint = build.endpoints[endpointName];
|
|
446
|
+
if (projectId && projectId !== endpoint.project) {
|
|
447
|
+
throw new error_1.FirebaseError(`Secret binding ${key} referenced unsupported cross-project secret in '${projectId}'`);
|
|
448
|
+
}
|
|
449
|
+
let notFound = true;
|
|
450
|
+
for (const envVar of endpoint.secretEnvironmentVariables ?? []) {
|
|
451
|
+
if (envVar.key === key) {
|
|
452
|
+
notFound = false;
|
|
453
|
+
envVar.secret = secretId;
|
|
454
|
+
if (typeof secretRef.version !== "undefined") {
|
|
455
|
+
envVar.version = version;
|
|
456
|
+
envVar.allowVersionPinning = true;
|
|
457
|
+
}
|
|
458
|
+
logger_1.logger.debug(`Merged secret: ${JSON.stringify(envVar)}`);
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
if (notFound) {
|
|
462
|
+
logger_1.logger.warn(`.env files contain a secret binding ${key} which has not been configured as a secret param via defineSecret().`);
|
|
463
|
+
}
|
|
464
|
+
}
|
|
465
|
+
}
|
|
466
|
+
}
|
|
467
|
+
function parseSecretRef(ref) {
|
|
468
|
+
const shortMatch = exports.SECRET_REF_SHORT_RE.exec(ref);
|
|
469
|
+
if (shortMatch) {
|
|
470
|
+
const output = {
|
|
471
|
+
secretId: shortMatch[1],
|
|
472
|
+
};
|
|
473
|
+
if (shortMatch[2] !== undefined) {
|
|
474
|
+
output.version = shortMatch[2];
|
|
475
|
+
if (ref.includes("#") || ref.includes("@")) {
|
|
476
|
+
throw new error_1.FirebaseError(`Malformed secret binding '${ref}'; secret versions are specified with ':'`);
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
return output;
|
|
480
|
+
}
|
|
481
|
+
const longMatch = exports.SECRET_REF_LONG_RE.exec(ref);
|
|
482
|
+
if (longMatch) {
|
|
483
|
+
const output = {
|
|
484
|
+
projectId: longMatch[1],
|
|
485
|
+
secretId: longMatch[2],
|
|
486
|
+
};
|
|
487
|
+
if (longMatch[3] !== undefined) {
|
|
488
|
+
output.version = longMatch[3];
|
|
489
|
+
if (ref.includes("#") || ref.includes("@")) {
|
|
490
|
+
throw new error_1.FirebaseError(`Malformed secret binding '${ref}'; secret versions are specified with ':'`);
|
|
491
|
+
}
|
|
492
|
+
}
|
|
493
|
+
return output;
|
|
494
|
+
}
|
|
495
|
+
throw new error_1.FirebaseError(`Unknown format for secret binding '${ref}'`);
|
|
496
|
+
}
|
|
@@ -14,11 +14,13 @@ const logger_1 = require("../../logger");
|
|
|
14
14
|
const error_1 = require("../../error");
|
|
15
15
|
const prompt_1 = require("../../prompt");
|
|
16
16
|
const secrets_1 = require("../../functions/secrets");
|
|
17
|
+
const build = require("./build");
|
|
17
18
|
const functional_1 = require("../../functional");
|
|
18
19
|
const secretManager = require("../../gcp/secretManager");
|
|
19
20
|
const storage_1 = require("../../gcp/storage");
|
|
20
21
|
const cel_1 = require("./cel");
|
|
21
22
|
const secretManager_1 = require("../../gcp/secretManager");
|
|
23
|
+
const experiments = require("../../experiments");
|
|
22
24
|
function dependenciesCEL(expr) {
|
|
23
25
|
const deps = [];
|
|
24
26
|
const paramCapture = /{{ params\.(\w+) }}/g;
|
|
@@ -160,8 +162,9 @@ function canSatisfyParam(param, value) {
|
|
|
160
162
|
}
|
|
161
163
|
(0, functional_1.assertExhaustive)(param);
|
|
162
164
|
}
|
|
163
|
-
async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, isEmulator = false) {
|
|
165
|
+
async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, force, isEmulator = false) {
|
|
164
166
|
const paramValues = populateDefaultParams(firebaseConfig);
|
|
167
|
+
const secretRefs = {};
|
|
165
168
|
const [resolved, outstanding] = (0, functional_1.partition)(params, (param) => {
|
|
166
169
|
return {}.hasOwnProperty.call(userEnvs, param.name);
|
|
167
170
|
});
|
|
@@ -171,7 +174,7 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, i
|
|
|
171
174
|
const [needSecret, needPrompt] = (0, functional_1.partition)(outstanding, (param) => param.type === "secret");
|
|
172
175
|
if (!isEmulator) {
|
|
173
176
|
for (const param of needSecret) {
|
|
174
|
-
await
|
|
177
|
+
secretRefs[param.name] = await ensureSecret(param, firebaseConfig.projectId, nonInteractive, force);
|
|
175
178
|
}
|
|
176
179
|
}
|
|
177
180
|
if (nonInteractive && needPrompt.length > 0) {
|
|
@@ -191,7 +194,7 @@ async function resolveParams(params, firebaseConfig, userEnvs, nonInteractive, i
|
|
|
191
194
|
}
|
|
192
195
|
paramValues[param.name] = await promptParam(param, firebaseConfig.projectId, paramDefault);
|
|
193
196
|
}
|
|
194
|
-
return paramValues;
|
|
197
|
+
return { paramValues: paramValues, secretRefs: secretRefs };
|
|
195
198
|
}
|
|
196
199
|
function populateDefaultParams(config) {
|
|
197
200
|
const defaultParams = {};
|
|
@@ -221,24 +224,45 @@ function populateDefaultParams(config) {
|
|
|
221
224
|
}
|
|
222
225
|
return defaultParams;
|
|
223
226
|
}
|
|
224
|
-
async function
|
|
225
|
-
const
|
|
227
|
+
async function ensureSecret(secretParam, projectId, nonInteractive, force) {
|
|
228
|
+
const resourceId = secretParam.resourceId || secretParam.name;
|
|
229
|
+
const version = secretParam.version || "latest";
|
|
230
|
+
let secretAlreadyExisted = false;
|
|
231
|
+
const metadata = await secretManager.getSecretMetadata(projectId, resourceId, version);
|
|
226
232
|
if (!metadata.secret) {
|
|
227
233
|
if (nonInteractive) {
|
|
228
|
-
throw new error_1.FirebaseError(`In non-interactive mode but have no value for the secret
|
|
234
|
+
throw new error_1.FirebaseError(`In non-interactive mode but have no value for the secret ${secretParam.name}: ${resourceId}\n\n` +
|
|
229
235
|
"Set this secret before deploying:\n" +
|
|
230
|
-
`\tfirebase functions:secrets:set ${
|
|
236
|
+
`\tfirebase functions:secrets:set ${resourceId}${secretParam.format === "json" ? " --format=json --data-file <file.json>" : ""}`);
|
|
231
237
|
}
|
|
232
|
-
|
|
238
|
+
if (experiments.isEnabled("secretEnvParams") && typeof secretParam.resourceId === "undefined") {
|
|
239
|
+
if (force) {
|
|
240
|
+
logger_1.logger.info(`--force: Using default resource ID for secret ${secretParam.name}`);
|
|
241
|
+
secretParam.resourceId = secretParam.name;
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
secretParam.resourceId = await (0, prompt_1.input)({
|
|
245
|
+
default: secretParam.name,
|
|
246
|
+
message: `What resource ID do you want to use for the backing Secret resource for secret param ${secretParam.name}?`,
|
|
247
|
+
validate: (id) => {
|
|
248
|
+
if (new RegExp(`^${build.GCP_SECRET_ID_PATTERN}$`).test(id)) {
|
|
249
|
+
return true;
|
|
250
|
+
}
|
|
251
|
+
return "GCP Secret identifiers must contain only letters, numbers, underscores, and hyphens.";
|
|
252
|
+
},
|
|
253
|
+
});
|
|
254
|
+
}
|
|
255
|
+
return ensureSecret(secretParam, projectId, nonInteractive, force);
|
|
256
|
+
}
|
|
257
|
+
const promptMessage = `The value for this secret (${secretParam.name}) will be stored in Cloud Secret Manager (https://cloud.google.com/secret-manager/pricing) as ${resourceId}. Enter ${secretParam.format === "json" ? "a JSON value" : "a value"} for ${secretParam.label || secretParam.name}:`;
|
|
233
258
|
const secretValue = await (0, prompt_1.password)({
|
|
234
259
|
message: promptMessage,
|
|
235
260
|
});
|
|
236
261
|
if (secretParam.format === "json") {
|
|
237
262
|
(0, secrets_1.validateJsonSecret)(secretParam.name, secretValue);
|
|
238
263
|
}
|
|
239
|
-
await secretManager.createSecret(projectId,
|
|
240
|
-
await secretManager.addVersion(projectId,
|
|
241
|
-
return;
|
|
264
|
+
await secretManager.createSecret(projectId, resourceId, (0, secretManager_1.labels)());
|
|
265
|
+
await secretManager.addVersion(projectId, resourceId, secretValue);
|
|
242
266
|
}
|
|
243
267
|
else if (!metadata.secretVersion) {
|
|
244
268
|
throw new error_1.FirebaseError(`Cloud Secret Manager has no latest version of the secret defined by param ${secretParam.label || secretParam.name}`);
|
|
@@ -247,6 +271,16 @@ async function handleSecret(secretParam, projectId, nonInteractive) {
|
|
|
247
271
|
metadata.secretVersion.state === "DISABLED") {
|
|
248
272
|
throw new error_1.FirebaseError(`Cloud Secret Manager's latest version of secret '${secretParam.label || secretParam.name} is in illegal state ${metadata.secretVersion.state}`);
|
|
249
273
|
}
|
|
274
|
+
else {
|
|
275
|
+
secretAlreadyExisted = true;
|
|
276
|
+
}
|
|
277
|
+
const secretRefString = typeof version === "undefined" ? resourceId : `${resourceId}:${version}`;
|
|
278
|
+
if (experiments.isEnabled("secretEnvParams")) {
|
|
279
|
+
if (!secretParam.inLocalEnvironment && secretAlreadyExisted) {
|
|
280
|
+
logger_1.logger.info(`Onetime (firebase-tools x.y.z+): storing a reference to existing secret ${secretParam.name}=${secretRefString} in .env files.`);
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
return secretRefString;
|
|
250
284
|
}
|
|
251
285
|
async function promptParam(param, projectId, resolvedDefault) {
|
|
252
286
|
if (param.type === "string") {
|
|
@@ -12,6 +12,7 @@ exports.resolveDefaultTimeout = resolveDefaultTimeout;
|
|
|
12
12
|
exports.loadCodebases = loadCodebases;
|
|
13
13
|
exports.warnIfNewGenkitFunctionIsMissingSecrets = warnIfNewGenkitFunctionIsMissingSecrets;
|
|
14
14
|
exports.ensureAllRequiredAPIsEnabled = ensureAllRequiredAPIsEnabled;
|
|
15
|
+
exports.partitionUserEnvs = partitionUserEnvs;
|
|
15
16
|
const clc = require("colorette");
|
|
16
17
|
const proto = require("../../gcp/proto");
|
|
17
18
|
const backend = require("./backend");
|
|
@@ -186,20 +187,27 @@ async function prepare(context, options, payload) {
|
|
|
186
187
|
projectAlias: options.projectAlias,
|
|
187
188
|
};
|
|
188
189
|
proto.convertIfPresent(userEnvOpt, localCfg, "configDir", (cd) => options.config.path(cd));
|
|
189
|
-
const
|
|
190
|
+
const rawUserEnvs = functionsEnv.loadUserEnvs(userEnvOpt);
|
|
191
|
+
const { userEnvs: userEnvs, secretRefs: secretRefs } = partitionUserEnvs(rawUserEnvs);
|
|
190
192
|
const envs = { ...userEnvs, ...firebaseEnvs };
|
|
191
193
|
const relevantEndpoints = backend
|
|
192
194
|
.allEndpoints(existingBackend)
|
|
193
195
|
.filter((e) => e.codebase === codebase || e.codebase === undefined);
|
|
194
196
|
await resolveDefaultRegionsForBuild(wantBuild, backend.of(...relevantEndpoints));
|
|
195
|
-
const
|
|
197
|
+
const parsedSecretRefs = (0, functional_1.mapObject)(secretRefs, (unparsed) => build.parseSecretRef(unparsed));
|
|
198
|
+
build.applyEnvSecretBindings(wantBuild, parsedSecretRefs);
|
|
199
|
+
const { backend: wantBackend, envs: resolvedEnvs, secretRefs: resolvedSecretRefs, } = await build.resolveBackend({
|
|
196
200
|
build: wantBuild,
|
|
197
201
|
firebaseConfig,
|
|
198
202
|
userEnvs,
|
|
199
203
|
nonInteractive: options.nonInteractive,
|
|
204
|
+
force: options.force,
|
|
200
205
|
isEmulator: false,
|
|
201
206
|
});
|
|
202
207
|
functionsEnv.writeResolvedParams(resolvedEnvs, userEnvs, userEnvOpt);
|
|
208
|
+
if (experiments.isEnabled("secretEnvParams")) {
|
|
209
|
+
functionsEnv.writeResolvedSecretRefs(resolvedSecretRefs, secretRefs, userEnvOpt);
|
|
210
|
+
}
|
|
203
211
|
let hasEnvsFromParams = false;
|
|
204
212
|
wantBackend.environmentVariables = envs;
|
|
205
213
|
for (const envName of Object.keys(resolvedEnvs)) {
|
|
@@ -586,3 +594,15 @@ async function ensureAllRequiredAPIsEnabled(projectNumber, wantBackend = backend
|
|
|
586
594
|
await ensureApiEnabled.ensure(projectNumber, (0, api_1.secretManagerOrigin)(), "functions", false);
|
|
587
595
|
}
|
|
588
596
|
}
|
|
597
|
+
function partitionUserEnvs(allEnvs) {
|
|
598
|
+
const [secretRefs, userEnvs] = Object.entries(allEnvs).reduce((accumulatedSplit, [k, v]) => {
|
|
599
|
+
if (k.startsWith(build.SECRET_REF_PREFIX)) {
|
|
600
|
+
accumulatedSplit[0][k.replace(build.SECRET_REF_PREFIX, "")] = v;
|
|
601
|
+
}
|
|
602
|
+
else {
|
|
603
|
+
accumulatedSplit[1][k] = v;
|
|
604
|
+
}
|
|
605
|
+
return accumulatedSplit;
|
|
606
|
+
}, [{}, {}]);
|
|
607
|
+
return { userEnvs: userEnvs, secretRefs: secretRefs };
|
|
608
|
+
}
|
|
@@ -17,8 +17,6 @@ const supported = require("../supported");
|
|
|
17
17
|
const validate = require("./validate");
|
|
18
18
|
const versioning = require("./versioning");
|
|
19
19
|
const fsutils_1 = require("../../../../fsutils");
|
|
20
|
-
const MIN_FUNCTIONS_SDK_VERSION = "3.20.0";
|
|
21
|
-
const MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES = "5.1.0";
|
|
22
20
|
async function tryCreateDelegate(context) {
|
|
23
21
|
const packageJsonPath = path.join(context.sourceDir, "package.json");
|
|
24
22
|
try {
|
|
@@ -169,14 +167,17 @@ class Delegate {
|
|
|
169
167
|
});
|
|
170
168
|
}
|
|
171
169
|
async discoverBuild(config, env) {
|
|
172
|
-
if (
|
|
173
|
-
|
|
170
|
+
if (this.sdkVersion === versioning.FUNCTIONS_SDK_DEV_VERSION) {
|
|
171
|
+
logger_1.logger.debug("Skipping check for MIN_FUNCTIONS_SDK_VERSION for local development version.");
|
|
172
|
+
}
|
|
173
|
+
else if (semver.valid(this.sdkVersion)) {
|
|
174
|
+
if (semver.lt(this.sdkVersion, versioning.MIN_FUNCTIONS_SDK_VERSION)) {
|
|
174
175
|
throw new error_1.FirebaseError(`You are using an old version of firebase-functions SDK (${this.sdkVersion}). ` +
|
|
175
|
-
`Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION}`);
|
|
176
|
+
`Please update firebase-functions SDK to >=${versioning.MIN_FUNCTIONS_SDK_VERSION}`);
|
|
176
177
|
}
|
|
177
|
-
if (semver.lt(this.sdkVersion, MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES)) {
|
|
178
|
+
if (semver.lt(this.sdkVersion, versioning.MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES)) {
|
|
178
179
|
(0, utils_1.logLabeledBullet)("functions", `You are using a version of firebase-functions SDK (${this.sdkVersion}) that does not have support for the newest Firebase Extensions features. ` +
|
|
179
|
-
`Please update firebase-functions SDK to >=${MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES} to use them correctly`);
|
|
180
|
+
`Please update firebase-functions SDK to >=${versioning.MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES} to use them correctly`);
|
|
180
181
|
}
|
|
181
182
|
}
|
|
182
183
|
else {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = void 0;
|
|
3
|
+
exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = exports.MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES = exports.MIN_FUNCTIONS_SDK_VERSION = exports.FUNCTIONS_SDK_DEV_VERSION = void 0;
|
|
4
4
|
exports.findModuleVersion = findModuleVersion;
|
|
5
5
|
exports.getFunctionsSDKVersion = getFunctionsSDKVersion;
|
|
6
6
|
exports.getLatestSDKVersion = getLatestSDKVersion;
|
|
@@ -12,7 +12,9 @@ const spawn = require("cross-spawn");
|
|
|
12
12
|
const semver = require("semver");
|
|
13
13
|
const logger_1 = require("../../../../logger");
|
|
14
14
|
const utils = require("../../../../utils");
|
|
15
|
-
|
|
15
|
+
exports.FUNCTIONS_SDK_DEV_VERSION = "0.0.0-development";
|
|
16
|
+
exports.MIN_FUNCTIONS_SDK_VERSION = "3.20.0";
|
|
17
|
+
exports.MIN_FUNCTIONS_SDK_VERSION_FOR_EXTENSIONS_FEATURES = "5.1.0";
|
|
16
18
|
const NPM_COMMAND_TIMEOUT_MILLIES = 10000;
|
|
17
19
|
exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING = clc.bold(clc.yellow("functions: ")) +
|
|
18
20
|
"You must have a " +
|
|
@@ -67,8 +69,11 @@ function getLatestSDKVersion() {
|
|
|
67
69
|
return output["dist-tags"]?.["latest"];
|
|
68
70
|
}
|
|
69
71
|
function checkFunctionsSDKVersion(currentVersion) {
|
|
72
|
+
if (currentVersion === exports.FUNCTIONS_SDK_DEV_VERSION) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
70
75
|
try {
|
|
71
|
-
if (semver.lt(currentVersion,
|
|
76
|
+
if (semver.lt(currentVersion, exports.MIN_FUNCTIONS_SDK_VERSION)) {
|
|
72
77
|
utils.logWarning(exports.FUNCTIONS_SDK_VERSION_TOO_OLD_WARNING);
|
|
73
78
|
}
|
|
74
79
|
const latest = exports.getLatestSDKVersion();
|
|
@@ -240,7 +240,7 @@ async function validateSecretVersions(projectId, endpoints) {
|
|
|
240
240
|
}
|
|
241
241
|
const results = await utils.allSettled(Array.from(toResolve).map(async (secret) => {
|
|
242
242
|
const sv = await (0, secretManager_1.getSecretVersion)(projectId, secret, "latest");
|
|
243
|
-
logger_1.logger.debug(`Resolved secret version of ${clc.bold(secret)} to ${clc.bold(sv.versionId)}.`);
|
|
243
|
+
logger_1.logger.debug(`Resolved latest secret version of ${clc.bold(secret)} to ${clc.bold(sv.versionId)}.`);
|
|
244
244
|
return sv;
|
|
245
245
|
}));
|
|
246
246
|
const secretVersions = {};
|
|
@@ -261,7 +261,10 @@ async function validateSecretVersions(projectId, endpoints) {
|
|
|
261
261
|
throw new error_1.FirebaseError("Failed to validate secret versions", { children: errs });
|
|
262
262
|
}
|
|
263
263
|
for (const s of secrets.of(endpoints)) {
|
|
264
|
-
s.version
|
|
264
|
+
if (!s.version || !s.allowVersionPinning) {
|
|
265
|
+
s.version = secretVersions[s.secret].versionId;
|
|
266
|
+
}
|
|
267
|
+
delete s.allowVersionPinning;
|
|
265
268
|
if (!s.version) {
|
|
266
269
|
throw new error_1.FirebaseError("Secret version is unexpectedly undefined. This should never happen.");
|
|
267
270
|
}
|
|
@@ -13,6 +13,7 @@ const api_1 = require("../../api");
|
|
|
13
13
|
const hashcache_1 = require("./hashcache");
|
|
14
14
|
const logger_1 = require("../../logger");
|
|
15
15
|
const error_1 = require("../../error");
|
|
16
|
+
const streamUtils_1 = require("../../streamUtils");
|
|
16
17
|
const MIN_UPLOAD_TIMEOUT = 30000;
|
|
17
18
|
const MAX_UPLOAD_TIMEOUT = 7200000;
|
|
18
19
|
function progressMessage(message, current, total) {
|
|
@@ -188,7 +189,7 @@ class Uploader {
|
|
|
188
189
|
logger_1.logger.debug("[hosting][upload]", this.uploadQueue.stats());
|
|
189
190
|
}
|
|
190
191
|
if (res.status !== 200) {
|
|
191
|
-
const errorMessage = await res.
|
|
192
|
+
const errorMessage = await (0, streamUtils_1.streamToString)(res.body);
|
|
192
193
|
logger_1.logger.debug(`[hosting][upload] ${this.hashMap[toUpload]} (${toUpload}) HTTP ERROR ${res.status}: headers=${JSON.stringify(Object.fromEntries(res.response.headers.entries()))} ${errorMessage}`);
|
|
193
194
|
throw new Error(`Unexpected error while uploading file: ${errorMessage}`);
|
|
194
195
|
}
|
|
@@ -52,7 +52,8 @@ class PostgresServer {
|
|
|
52
52
|
logger_1.logger.debug("Postgres client disconnected");
|
|
53
53
|
});
|
|
54
54
|
socket.on("error", (err) => {
|
|
55
|
-
|
|
55
|
+
logger_1.logger.debug("Postgres client socket error (if this happened during request cancellation, it is expected and harmless):", err);
|
|
56
|
+
socket.destroy();
|
|
56
57
|
});
|
|
57
58
|
});
|
|
58
59
|
this.server = server;
|
|
@@ -8,12 +8,12 @@
|
|
|
8
8
|
"downloadPathRelativeToCacheDir": "firebase-database-emulator-v4.11.2.jar"
|
|
9
9
|
},
|
|
10
10
|
"firestore": {
|
|
11
|
-
"version": "1.
|
|
12
|
-
"expectedSize":
|
|
13
|
-
"expectedChecksum": "
|
|
14
|
-
"expectedChecksumSHA256": "
|
|
15
|
-
"remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.
|
|
16
|
-
"downloadPathRelativeToCacheDir": "cloud-firestore-emulator-v1.
|
|
11
|
+
"version": "1.22.0",
|
|
12
|
+
"expectedSize": 136707194,
|
|
13
|
+
"expectedChecksum": "5d74cc6bee9e18560d2eae2c6440fd13",
|
|
14
|
+
"expectedChecksumSHA256": "9b6498b7f62714d67f48f59b3818883cd682dbcd46b9f59511de81c97bb5166c",
|
|
15
|
+
"remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.22.0.jar",
|
|
16
|
+
"downloadPathRelativeToCacheDir": "cloud-firestore-emulator-v1.22.0.jar"
|
|
17
17
|
},
|
|
18
18
|
"storage": {
|
|
19
19
|
"version": "1.1.3",
|
|
@@ -14,6 +14,7 @@ const downloadableEmulators_1 = require("./downloadableEmulators");
|
|
|
14
14
|
const node_fs_1 = require("node:fs");
|
|
15
15
|
const track_1 = require("../track");
|
|
16
16
|
const api_1 = require("../api");
|
|
17
|
+
const streamUtils_1 = require("../streamUtils");
|
|
17
18
|
class HubExport {
|
|
18
19
|
constructor(projectId, options) {
|
|
19
20
|
this.projectId = projectId;
|
|
@@ -217,7 +218,7 @@ class HubExport {
|
|
|
217
218
|
resolveOnHTTPError: true,
|
|
218
219
|
});
|
|
219
220
|
if (res.status >= 400) {
|
|
220
|
-
throw new error_1.FirebaseError(`Failed to export storage: ${await res.
|
|
221
|
+
throw new error_1.FirebaseError(`Failed to export storage: ${await (0, streamUtils_1.streamToString)(res.body)}`);
|
|
221
222
|
}
|
|
222
223
|
}
|
|
223
224
|
async exportDataConnect(metadata) {
|
|
@@ -6,6 +6,7 @@ const types_1 = require("../../types");
|
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
7
7
|
const metadata_1 = require("../metadata");
|
|
8
8
|
const express_1 = require("express");
|
|
9
|
+
const bodyParser = require("body-parser");
|
|
9
10
|
const shared_1 = require("./shared");
|
|
10
11
|
const registry_1 = require("../../registry");
|
|
11
12
|
const multipart_1 = require("../multipart");
|
|
@@ -15,6 +16,23 @@ const request_1 = require("../../shared/request");
|
|
|
15
16
|
function createFirebaseEndpoints(emulator) {
|
|
16
17
|
const firebaseStorageAPI = (0, express_1.Router)();
|
|
17
18
|
const { storageLayer, uploadService } = emulator;
|
|
19
|
+
const firebasePostUploadMiddleware = (req, res, next) => {
|
|
20
|
+
if (req.method === "PUT" && req.header("x-http-method-override")?.toLowerCase() === "patch") {
|
|
21
|
+
(0, express_1.json)({ limit: "130mb" })(req, res, next);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
const uploadType = req.header("x-goog-upload-protocol");
|
|
25
|
+
const uploadCommand = req.header("x-goog-upload-command");
|
|
26
|
+
if (uploadCommand === "start") {
|
|
27
|
+
(0, express_1.json)({ limit: "130mb" })(req, res, next);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
if (uploadType === "multipart") {
|
|
31
|
+
next();
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
bodyParser.raw({ type: "*/*", limit: "130mb" })(req, res, next);
|
|
35
|
+
};
|
|
18
36
|
if (process.env.STORAGE_EMULATOR_DEBUG) {
|
|
19
37
|
firebaseStorageAPI.use((req, res, next) => {
|
|
20
38
|
console.log("--------------INCOMING FIREBASE REQUEST--------------");
|
|
@@ -54,7 +72,7 @@ function createFirebaseEndpoints(emulator) {
|
|
|
54
72
|
next();
|
|
55
73
|
});
|
|
56
74
|
}
|
|
57
|
-
firebaseStorageAPI.use(/.*\/b\/(.+?)
|
|
75
|
+
firebaseStorageAPI.use(/.*\/b\/(.+?)\/.*/i, (req, res, next) => {
|
|
58
76
|
const bucketId = req.params[0];
|
|
59
77
|
storageLayer.createBucket(bucketId);
|
|
60
78
|
if (!emulator.rulesManager.getRuleset(bucketId)) {
|
|
@@ -107,7 +125,7 @@ function createFirebaseEndpoints(emulator) {
|
|
|
107
125
|
let prefix = "";
|
|
108
126
|
if (req.query.prefix) {
|
|
109
127
|
prefix = req.query.prefix.toString();
|
|
110
|
-
if (prefix.
|
|
128
|
+
if (!prefix.endsWith("/")) {
|
|
111
129
|
return res.status(400).json({
|
|
112
130
|
error: {
|
|
113
131
|
code: 400,
|
|
@@ -323,6 +341,7 @@ function createFirebaseEndpoints(emulator) {
|
|
|
323
341
|
bucketId: req.params.bucketId,
|
|
324
342
|
objectId: objectId,
|
|
325
343
|
dataRaw: await (0, request_1.reqBodyToBuffer)(req),
|
|
344
|
+
contentType: req.header("content-type"),
|
|
326
345
|
authorization: req.header("authorization"),
|
|
327
346
|
});
|
|
328
347
|
return await finalizeOneShotUpload(upload);
|
|
@@ -421,8 +440,8 @@ function createFirebaseEndpoints(emulator) {
|
|
|
421
440
|
setObjectHeaders(res, metadata);
|
|
422
441
|
return res.json(new metadata_1.OutgoingFirebaseMetadata(metadata));
|
|
423
442
|
};
|
|
424
|
-
firebaseStorageAPI.patch("/b/:bucketId/o/:objectId", handleMetadataUpdate);
|
|
425
|
-
firebaseStorageAPI.put("/b/:bucketId/o/:objectId?", async (req, res) => {
|
|
443
|
+
firebaseStorageAPI.patch("/b/:bucketId/o/:objectId", (0, express_1.json)({ limit: "130mb" }), handleMetadataUpdate);
|
|
444
|
+
firebaseStorageAPI.put("/b/:bucketId/o/:objectId?", firebasePostUploadMiddleware, async (req, res) => {
|
|
426
445
|
switch (req.header("x-http-method-override")?.toLowerCase()) {
|
|
427
446
|
case "patch":
|
|
428
447
|
return handleMetadataUpdate(req, res);
|
|
@@ -430,7 +449,7 @@ function createFirebaseEndpoints(emulator) {
|
|
|
430
449
|
return handleObjectPostRequest(req, res);
|
|
431
450
|
}
|
|
432
451
|
});
|
|
433
|
-
firebaseStorageAPI.post("/b/:bucketId/o/:objectId?", handleObjectPostRequest);
|
|
452
|
+
firebaseStorageAPI.post("/b/:bucketId/o/:objectId?", firebasePostUploadMiddleware, handleObjectPostRequest);
|
|
434
453
|
firebaseStorageAPI.delete("/b/:bucketId/o/:objectId", async (req, res) => {
|
|
435
454
|
try {
|
|
436
455
|
await storageLayer.deleteObject({
|