firebase-tools 15.22.4 → 15.24.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/apiv2.js +91 -32
- package/lib/apphosting/backend.js +11 -4
- package/lib/bin/cli.js +9 -2
- package/lib/bin/progressiveHelp.js +126 -0
- package/lib/checkValidTargetFilters.js +1 -1
- package/lib/command.js +0 -7
- package/lib/commands/dataconnect-execute.js +1 -1
- package/lib/commands/deploy.js +27 -64
- package/lib/commands/functions-delete.js +5 -3
- package/lib/commands/functions-lifecycle-list.js +94 -0
- package/lib/commands/functions-lifecycle-run.js +29 -0
- package/lib/commands/index.js +3 -0
- package/lib/database/import.js +3 -3
- package/lib/dataconnect/webhook.js +1 -2
- package/lib/deploy/apphosting/index.js +26 -1
- package/lib/deploy/auth/index.js +18 -1
- package/lib/deploy/database/index.js +16 -1
- package/lib/deploy/dataconnect/index.js +19 -1
- package/lib/deploy/extensions/index.js +9 -1
- package/lib/deploy/firestore/index.js +20 -1
- package/lib/deploy/functions/backend.js +9 -0
- package/lib/deploy/functions/build.js +3 -0
- package/lib/deploy/functions/index.js +33 -1
- package/lib/deploy/functions/params.js +23 -15
- package/lib/deploy/functions/prepare.js +96 -1
- package/lib/deploy/functions/prompts.js +81 -0
- package/lib/deploy/functions/release/fabricator.js +79 -4
- package/lib/deploy/functions/release/index.js +45 -23
- package/lib/deploy/functions/release/lifecycle.js +79 -53
- package/lib/deploy/functions/release/planner.js +43 -5
- package/lib/deploy/functions/runtimes/discovery/index.js +4 -3
- package/lib/deploy/functions/runtimes/discovery/v1alpha1.js +18 -1
- package/lib/deploy/functions/runtimes/node/index.js +1 -2
- package/lib/deploy/functions/runtimes/python/index.js +1 -2
- package/lib/deploy/hosting/index.js +30 -1
- package/lib/deploy/hosting/uploader.js +2 -3
- package/lib/deploy/index.js +68 -8
- package/lib/deploy/remoteconfig/index.js +9 -1
- package/lib/deploy/storage/index.js +16 -1
- package/lib/downloadUtils.js +3 -1
- package/lib/emulator/auth/operations.js +18 -8
- package/lib/emulator/downloadableEmulatorInfo.json +24 -24
- package/lib/emulator/storage/apis/gcloud.js +61 -0
- package/lib/emulator/storage/multipart.js +82 -2
- package/lib/emulator/taskQueue.js +3 -11
- package/lib/extensions/extensionsHelper.js +6 -4
- package/lib/frameworks/utils.js +50 -1
- package/lib/gcp/iam.js +68 -2
- package/lib/gcp/knownRoles.json +99 -0
- package/lib/gcp/resourceManager.js +42 -1
- package/lib/gemini/fdcExperience.js +2 -2
- package/lib/hosting/initMiddleware.js +1 -1
- package/lib/hosting/proxy.js +57 -23
- package/lib/index.js +0 -1
- package/lib/management/apps.js +4 -2
- package/lib/profiler.js +1 -2
- package/lib/streamUtils.js +24 -0
- package/lib/track.js +1 -2
- package/lib/tsconfig.compile.tsbuildinfo +1 -1
- package/lib/tsconfig.publish.tsbuildinfo +1 -1
- package/lib/utils.js +4 -21
- package/package.json +2 -4
|
@@ -75,9 +75,27 @@ function calculateUpdate(want, have) {
|
|
|
75
75
|
}
|
|
76
76
|
return update;
|
|
77
77
|
}
|
|
78
|
-
function createDeploymentPlan(args) {
|
|
79
|
-
let { wantBackend, haveBackend, codebase, filters, deleteAll } = args;
|
|
80
|
-
|
|
78
|
+
async function createDeploymentPlan(args) {
|
|
79
|
+
let { wantBackend, haveBackend, codebase, filters, deleteAll, haveRoles, existingManagedSA, managedSA, } = args;
|
|
80
|
+
const requiredRoles = wantBackend.requiredRoles;
|
|
81
|
+
const roles = haveRoles || [];
|
|
82
|
+
let rolesToAdd;
|
|
83
|
+
let rolesToRemove;
|
|
84
|
+
let serviceAccountToCreate;
|
|
85
|
+
let serviceAccountToDelete;
|
|
86
|
+
const isFiltered = !!(filters &&
|
|
87
|
+
filters.some((f) => f.idChunks && f.idChunks.length > 0) &&
|
|
88
|
+
!deleteAll);
|
|
89
|
+
if (requiredRoles) {
|
|
90
|
+
rolesToAdd = requiredRoles.filter((r) => !roles.includes(r));
|
|
91
|
+
rolesToRemove = roles.filter((r) => !requiredRoles.includes(r));
|
|
92
|
+
if (!existingManagedSA && managedSA) {
|
|
93
|
+
serviceAccountToCreate = managedSA;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
else if (existingManagedSA && !isFiltered) {
|
|
97
|
+
serviceAccountToDelete = existingManagedSA;
|
|
98
|
+
}
|
|
81
99
|
wantBackend = backend.matchingBackend(wantBackend, (endpoint) => {
|
|
82
100
|
return (0, functionsDeployHelper_1.endpointMatchesAnyFilter)(endpoint, filters);
|
|
83
101
|
});
|
|
@@ -85,13 +103,14 @@ function createDeploymentPlan(args) {
|
|
|
85
103
|
haveBackend = backend.matchingBackend(haveBackend, (endpoint) => {
|
|
86
104
|
return wantedEndpoint(endpoint) || (0, functionsDeployHelper_1.endpointMatchesAnyFilter)(endpoint, filters);
|
|
87
105
|
});
|
|
106
|
+
const regionalChangesets = {};
|
|
88
107
|
const regions = new Set([
|
|
89
108
|
...Object.keys(wantBackend.endpoints),
|
|
90
109
|
...Object.keys(haveBackend.endpoints),
|
|
91
110
|
]);
|
|
92
111
|
for (const region of regions) {
|
|
93
112
|
const changesets = calculateChangesets(wantBackend.endpoints[region] || {}, haveBackend.endpoints[region] || {}, (e) => `${codebase}-${e.region}-${e.availableMemoryMb || "default"}`, deleteAll);
|
|
94
|
-
|
|
113
|
+
Object.assign(regionalChangesets, changesets);
|
|
95
114
|
}
|
|
96
115
|
if (upgradedToGCFv2WithoutSettingConcurrency(wantBackend, haveBackend)) {
|
|
97
116
|
utils.logLabeledBullet("functions", "You are updating one or more functions to Google Cloud Functions v2, " +
|
|
@@ -99,7 +118,26 @@ function createDeploymentPlan(args) {
|
|
|
99
118
|
"default to 80 concurrent executions, but existing functions keep the " +
|
|
100
119
|
"old default of 1. You can change this with the 'concurrency' option.");
|
|
101
120
|
}
|
|
102
|
-
|
|
121
|
+
if (requiredRoles) {
|
|
122
|
+
if (!managedSA) {
|
|
123
|
+
throw new error_1.FirebaseError("managedServiceAccount is required when requiredRoles is defined.", {
|
|
124
|
+
exit: 1,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
return {
|
|
128
|
+
regionalChangesets,
|
|
129
|
+
rolesToAdd,
|
|
130
|
+
rolesToRemove,
|
|
131
|
+
serviceAccountToCreate,
|
|
132
|
+
managedServiceAccount: managedSA,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
return {
|
|
137
|
+
regionalChangesets,
|
|
138
|
+
serviceAccountToDelete,
|
|
139
|
+
};
|
|
140
|
+
}
|
|
103
141
|
}
|
|
104
142
|
function upgradedToGCFv2WithoutSettingConcurrency(want, have) {
|
|
105
143
|
return backend.someEndpoint(want, (endpoint) => {
|
|
@@ -5,7 +5,6 @@ exports.yamlToBuild = yamlToBuild;
|
|
|
5
5
|
exports.detectFromYaml = detectFromYaml;
|
|
6
6
|
exports.detectFromPort = detectFromPort;
|
|
7
7
|
exports.detectFromOutputPath = detectFromOutputPath;
|
|
8
|
-
const node_fetch_1 = require("node-fetch");
|
|
9
8
|
const fs = require("fs");
|
|
10
9
|
const path = require("path");
|
|
11
10
|
const yaml = require("yaml");
|
|
@@ -65,12 +64,14 @@ async function detectFromPort(port, project, runtime, initialDelay = 0, timeout
|
|
|
65
64
|
const url = `http://127.0.0.1:${port}/__/functions.yaml`;
|
|
66
65
|
while (true) {
|
|
67
66
|
try {
|
|
68
|
-
res = await Promise.race([(
|
|
67
|
+
res = await Promise.race([fetch(url), timedOut]);
|
|
69
68
|
break;
|
|
70
69
|
}
|
|
71
70
|
catch (err) {
|
|
71
|
+
const realErr = err?.cause || err;
|
|
72
72
|
if (err?.name === "FetchError" ||
|
|
73
|
-
|
|
73
|
+
realErr?.name === "FetchError" ||
|
|
74
|
+
["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"].includes(realErr?.code)) {
|
|
74
75
|
continue;
|
|
75
76
|
}
|
|
76
77
|
throw err;
|
|
@@ -20,6 +20,7 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
|
|
|
20
20
|
specVersion: "string",
|
|
21
21
|
params: "array",
|
|
22
22
|
requiredAPIs: "array",
|
|
23
|
+
requiredRoles: "array",
|
|
23
24
|
endpoints: "object",
|
|
24
25
|
extensions: "object",
|
|
25
26
|
lifecycleHooks: "object",
|
|
@@ -27,6 +28,9 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
|
|
|
27
28
|
const bd = build.empty();
|
|
28
29
|
bd.params = manifest.params || [];
|
|
29
30
|
bd.requiredAPIs = parseRequiredAPIs(manifest);
|
|
31
|
+
if (manifest.requiredRoles) {
|
|
32
|
+
bd.requiredRoles = parseRequiredRoles(manifest);
|
|
33
|
+
}
|
|
30
34
|
for (const id of Object.keys(manifest.endpoints)) {
|
|
31
35
|
const me = manifest.endpoints[id];
|
|
32
36
|
assertBuildEndpoint(me, id);
|
|
@@ -45,7 +49,7 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
|
|
|
45
49
|
if (manifest.lifecycleHooks) {
|
|
46
50
|
bd.lifecycleHooks = {};
|
|
47
51
|
for (const id of Object.keys(manifest.lifecycleHooks)) {
|
|
48
|
-
if (id !== "
|
|
52
|
+
if (id !== "afterFirstDeploy" && id !== "afterRedeploy") {
|
|
49
53
|
throw new error_1.FirebaseError(`Invalid eventType "${id}" for lifecycle hook.`);
|
|
50
54
|
}
|
|
51
55
|
const hook = manifest.lifecycleHooks[id];
|
|
@@ -76,6 +80,19 @@ function buildFromV1Alpha1(yaml, project, region, runtime) {
|
|
|
76
80
|
}
|
|
77
81
|
return bd;
|
|
78
82
|
}
|
|
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
|
+
function parseRequiredRoles(manifest) {
|
|
85
|
+
const roles = manifest.requiredRoles || [];
|
|
86
|
+
for (const role of roles) {
|
|
87
|
+
if (typeof role !== "string") {
|
|
88
|
+
throw new error_1.FirebaseError(`Invalid role "${JSON.stringify(role)}". Expected string`);
|
|
89
|
+
}
|
|
90
|
+
if (!ROLE_REGEX.test(role)) {
|
|
91
|
+
throw new error_1.FirebaseError(`Invalid IAM role format "${role}".`);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
return Array.from(new Set(roles));
|
|
95
|
+
}
|
|
79
96
|
function parseRequiredAPIs(manifest) {
|
|
80
97
|
const requiredAPIs = manifest.requiredAPIs || [];
|
|
81
98
|
for (const { api, reason } of requiredAPIs) {
|
|
@@ -8,7 +8,6 @@ const path = require("path");
|
|
|
8
8
|
const portfinder = require("portfinder");
|
|
9
9
|
const semver = require("semver");
|
|
10
10
|
const spawn = require("cross-spawn");
|
|
11
|
-
const node_fetch_1 = require("node-fetch");
|
|
12
11
|
const error_1 = require("../../../../error");
|
|
13
12
|
const parseRuntimeAndValidateSDK_1 = require("./parseRuntimeAndValidateSDK");
|
|
14
13
|
const logger_1 = require("../../../../logger");
|
|
@@ -156,7 +155,7 @@ class Delegate {
|
|
|
156
155
|
childProcess.once("error", reject);
|
|
157
156
|
});
|
|
158
157
|
try {
|
|
159
|
-
await (
|
|
158
|
+
await fetch(`http://localhost:${port}/__/quitquitquit`);
|
|
160
159
|
}
|
|
161
160
|
catch (e) {
|
|
162
161
|
logger_1.logger.debug("Failed to call quitquitquit. This often means the server failed to start", e);
|
|
@@ -5,7 +5,6 @@ exports.tryCreateDelegate = tryCreateDelegate;
|
|
|
5
5
|
exports.getPythonBinary = getPythonBinary;
|
|
6
6
|
const fs = require("fs");
|
|
7
7
|
const path = require("path");
|
|
8
|
-
const node_fetch_1 = require("node-fetch");
|
|
9
8
|
const util_1 = require("util");
|
|
10
9
|
const portfinder = require("portfinder");
|
|
11
10
|
const discovery = require("../discovery");
|
|
@@ -130,7 +129,7 @@ class Delegate {
|
|
|
130
129
|
});
|
|
131
130
|
return Promise.resolve(async () => {
|
|
132
131
|
try {
|
|
133
|
-
await (
|
|
132
|
+
await fetch(`http://127.0.0.1:${port}/__/quitquitquit`);
|
|
134
133
|
}
|
|
135
134
|
catch (e) {
|
|
136
135
|
logger_1.logger.debug("Failed to call quitquitquit. This often means the server failed to start", e);
|
|
@@ -1,9 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.release = exports.deploy = exports.prepare = void 0;
|
|
3
|
+
exports.detailedHelp = exports.help = exports.release = exports.deploy = exports.prepare = void 0;
|
|
4
4
|
var prepare_1 = require("./prepare");
|
|
5
5
|
Object.defineProperty(exports, "prepare", { enumerable: true, get: function () { return prepare_1.prepare; } });
|
|
6
6
|
var deploy_1 = require("./deploy");
|
|
7
7
|
Object.defineProperty(exports, "deploy", { enumerable: true, get: function () { return deploy_1.deploy; } });
|
|
8
8
|
var release_1 = require("./release");
|
|
9
9
|
Object.defineProperty(exports, "release", { enumerable: true, get: function () { return release_1.release; } });
|
|
10
|
+
exports.help = "Deploys static web apps to Firebase Hosting, including assets, redirects, rewrites and headers.";
|
|
11
|
+
exports.detailedHelp = "Firebase Hosting deploys web assets, redirects, rewrites, and header configurations.\n\n" +
|
|
12
|
+
"Single site configuration in firebase.json:\n" +
|
|
13
|
+
"{\n" +
|
|
14
|
+
' "hosting": {\n' +
|
|
15
|
+
' "public": "public",\n' +
|
|
16
|
+
' "ignore": [\n' +
|
|
17
|
+
' "firebase.json",\n' +
|
|
18
|
+
' "**/.*",\n' +
|
|
19
|
+
' "**/node_modules/**"\n' +
|
|
20
|
+
" ],\n" +
|
|
21
|
+
' "rewrites": [\n' +
|
|
22
|
+
' { "source": "**", "destination": "/index.html" }\n' +
|
|
23
|
+
" ]\n" +
|
|
24
|
+
" }\n" +
|
|
25
|
+
"}\n\n" +
|
|
26
|
+
"Multiple sites configuration (by site ID or deploy target):\n" +
|
|
27
|
+
"{\n" +
|
|
28
|
+
' "hosting": [\n' +
|
|
29
|
+
" {\n" +
|
|
30
|
+
' "site": "my-site-id",\n' +
|
|
31
|
+
' "public": "dist"\n' +
|
|
32
|
+
" },\n" +
|
|
33
|
+
" {\n" +
|
|
34
|
+
' "target": "my-site-target",\n' +
|
|
35
|
+
' "public": "build"\n' +
|
|
36
|
+
" }\n" +
|
|
37
|
+
" ]\n" +
|
|
38
|
+
"}";
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Uploader = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
|
-
const abort_controller_1 = require("abort-controller");
|
|
6
5
|
const clc = require("colorette");
|
|
7
6
|
const crypto = require("crypto");
|
|
8
7
|
const fs = require("fs");
|
|
@@ -172,7 +171,7 @@ class Uploader {
|
|
|
172
171
|
if (!this.uploadClient) {
|
|
173
172
|
throw new error_1.FirebaseError("No upload client available.", { exit: 2 });
|
|
174
173
|
}
|
|
175
|
-
const controller = new
|
|
174
|
+
const controller = new AbortController();
|
|
176
175
|
const timeout = setTimeout(() => {
|
|
177
176
|
controller.abort();
|
|
178
177
|
}, this.uploadTimeout(this.hashMap[toUpload]));
|
|
@@ -190,7 +189,7 @@ class Uploader {
|
|
|
190
189
|
}
|
|
191
190
|
if (res.status !== 200) {
|
|
192
191
|
const errorMessage = await res.response.text();
|
|
193
|
-
logger_1.logger.debug(`[hosting][upload] ${this.hashMap[toUpload]} (${toUpload}) HTTP ERROR ${res.status}: headers=${JSON.stringify(res.response.headers.
|
|
192
|
+
logger_1.logger.debug(`[hosting][upload] ${this.hashMap[toUpload]} (${toUpload}) HTTP ERROR ${res.status}: headers=${JSON.stringify(Object.fromEntries(res.response.headers.entries()))} ${errorMessage}`);
|
|
194
193
|
throw new Error(`Unexpected error while uploading file: ${errorMessage}`);
|
|
195
194
|
}
|
|
196
195
|
}
|
package/lib/deploy/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deploy = exports.isDeployingWebFramework = void 0;
|
|
3
|
+
exports.deploy = exports.isDeployingWebFramework = exports.TARGETS = exports.TARGET_PERMISSIONS = exports.VALID_DEPLOY_TARGETS = void 0;
|
|
4
4
|
const clc = require("colorette");
|
|
5
5
|
const logger_1 = require("../logger");
|
|
6
6
|
const api_1 = require("../api");
|
|
@@ -24,11 +24,71 @@ const AppHostingTarget = require("./apphosting");
|
|
|
24
24
|
const AuthTarget = require("./auth");
|
|
25
25
|
const frameworks_1 = require("../frameworks");
|
|
26
26
|
const prepare_1 = require("./hosting/prepare");
|
|
27
|
-
const utils_2 = require("../utils");
|
|
28
|
-
const deploy_1 = require("../commands/deploy");
|
|
29
27
|
const requirePermissions_1 = require("../requirePermissions");
|
|
30
28
|
const context_1 = require("./dataconnect/context");
|
|
31
|
-
|
|
29
|
+
exports.VALID_DEPLOY_TARGETS = [
|
|
30
|
+
"database",
|
|
31
|
+
"storage",
|
|
32
|
+
"firestore",
|
|
33
|
+
"functions",
|
|
34
|
+
"hosting",
|
|
35
|
+
"remoteconfig",
|
|
36
|
+
"extensions",
|
|
37
|
+
"dataconnect",
|
|
38
|
+
"apphosting",
|
|
39
|
+
"auth",
|
|
40
|
+
];
|
|
41
|
+
exports.TARGET_PERMISSIONS = {
|
|
42
|
+
database: ["firebasedatabase.instances.update"],
|
|
43
|
+
hosting: ["firebasehosting.sites.update"],
|
|
44
|
+
functions: [
|
|
45
|
+
"cloudfunctions.functions.list",
|
|
46
|
+
"cloudfunctions.functions.create",
|
|
47
|
+
"cloudfunctions.functions.get",
|
|
48
|
+
"cloudfunctions.functions.update",
|
|
49
|
+
"cloudfunctions.functions.delete",
|
|
50
|
+
"cloudfunctions.operations.get",
|
|
51
|
+
],
|
|
52
|
+
firestore: [
|
|
53
|
+
"datastore.indexes.list",
|
|
54
|
+
"datastore.indexes.create",
|
|
55
|
+
"datastore.indexes.update",
|
|
56
|
+
"datastore.indexes.delete",
|
|
57
|
+
],
|
|
58
|
+
storage: [
|
|
59
|
+
"firebaserules.releases.create",
|
|
60
|
+
"firebaserules.rulesets.create",
|
|
61
|
+
"firebaserules.releases.update",
|
|
62
|
+
],
|
|
63
|
+
remoteconfig: ["cloudconfig.configs.get", "cloudconfig.configs.update"],
|
|
64
|
+
dataconnect: [
|
|
65
|
+
"cloudsql.databases.create",
|
|
66
|
+
"cloudsql.databases.update",
|
|
67
|
+
"cloudsql.instances.connect",
|
|
68
|
+
"cloudsql.instances.create",
|
|
69
|
+
"cloudsql.instances.get",
|
|
70
|
+
"cloudsql.instances.list",
|
|
71
|
+
"cloudsql.instances.update",
|
|
72
|
+
"cloudsql.users.create",
|
|
73
|
+
"firebasedataconnect.connectors.create",
|
|
74
|
+
"firebasedataconnect.connectors.delete",
|
|
75
|
+
"firebasedataconnect.connectors.list",
|
|
76
|
+
"firebasedataconnect.connectors.update",
|
|
77
|
+
"firebasedataconnect.operations.get",
|
|
78
|
+
"firebasedataconnect.services.create",
|
|
79
|
+
"firebasedataconnect.services.delete",
|
|
80
|
+
"firebasedataconnect.services.update",
|
|
81
|
+
"firebasedataconnect.services.list",
|
|
82
|
+
"firebasedataconnect.schemas.create",
|
|
83
|
+
"firebasedataconnect.schemas.delete",
|
|
84
|
+
"firebasedataconnect.schemas.list",
|
|
85
|
+
"firebasedataconnect.schemas.update",
|
|
86
|
+
],
|
|
87
|
+
apphosting: [],
|
|
88
|
+
extensions: [],
|
|
89
|
+
auth: ["firebase.projects.update", "firebaseauth.configs.update"],
|
|
90
|
+
};
|
|
91
|
+
exports.TARGETS = {
|
|
32
92
|
hosting: HostingTarget,
|
|
33
93
|
database: DatabaseTarget,
|
|
34
94
|
firestore: FirestoreTarget,
|
|
@@ -84,10 +144,10 @@ const deploy = async function (targetNames, options, customContext = {}) {
|
|
|
84
144
|
if (!targetNames.includes("functions")) {
|
|
85
145
|
targetNames.unshift("functions");
|
|
86
146
|
try {
|
|
87
|
-
await (0, requirePermissions_1.requirePermissions)(options,
|
|
147
|
+
await (0, requirePermissions_1.requirePermissions)(options, exports.TARGET_PERMISSIONS["functions"]);
|
|
88
148
|
}
|
|
89
149
|
catch (e) {
|
|
90
|
-
if ((0,
|
|
150
|
+
if ((0, utils_1.isRunningInGithubAction)()) {
|
|
91
151
|
throw new error_1.FirebaseError("It looks like you are deploying a Hosting site along with Cloud Functions " +
|
|
92
152
|
"using a GitHub action version that did not include Cloud Functions " +
|
|
93
153
|
"permissions. Please reinstall the GitHub action with" +
|
|
@@ -101,7 +161,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
|
|
|
101
161
|
await (0, prepare_1.addPinnedFunctionsToOnlyString)(context, options);
|
|
102
162
|
}
|
|
103
163
|
for (const targetName of targetNames) {
|
|
104
|
-
const target = TARGETS[targetName];
|
|
164
|
+
const target = exports.TARGETS[targetName];
|
|
105
165
|
if (!target) {
|
|
106
166
|
return Promise.reject(new error_1.FirebaseError(`${(0, colorette_1.bold)(targetName)} is not a valid deploy target`));
|
|
107
167
|
}
|
|
@@ -138,7 +198,7 @@ const deploy = async function (targetNames, options, customContext = {}) {
|
|
|
138
198
|
};
|
|
139
199
|
const duration = Date.now() - startTime;
|
|
140
200
|
const params = Object.assign({}, baseParams);
|
|
141
|
-
Object.keys(TARGETS).reduce((accum, t) => {
|
|
201
|
+
Object.keys(exports.TARGETS).reduce((accum, t) => {
|
|
142
202
|
accum[t] = "false";
|
|
143
203
|
return accum;
|
|
144
204
|
}, params);
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.deploy = exports.release = exports.prepare = void 0;
|
|
3
|
+
exports.detailedHelp = exports.help = exports.deploy = exports.release = exports.prepare = void 0;
|
|
4
4
|
const prepare_1 = require("./prepare");
|
|
5
5
|
exports.prepare = prepare_1.default;
|
|
6
6
|
const release_1 = require("./release");
|
|
7
7
|
exports.release = release_1.default;
|
|
8
8
|
const deploy_1 = require("./deploy");
|
|
9
9
|
exports.deploy = deploy_1.default;
|
|
10
|
+
exports.help = "Deploys Remote Config templates defined in your project's firebase.json.";
|
|
11
|
+
exports.detailedHelp = "Firebase Remote Config deploys client-facing templates and configurations.\n\n" +
|
|
12
|
+
"Configuration format in firebase.json:\n" +
|
|
13
|
+
"{\n" +
|
|
14
|
+
' "remoteconfig": {\n' +
|
|
15
|
+
' "template": "remoteconfig.template.json"\n' +
|
|
16
|
+
" }\n" +
|
|
17
|
+
"}";
|
|
@@ -1,9 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.release = exports.deploy = exports.prepare = void 0;
|
|
3
|
+
exports.detailedHelp = exports.help = exports.release = exports.deploy = exports.prepare = void 0;
|
|
4
4
|
const prepare_1 = require("./prepare");
|
|
5
5
|
exports.prepare = prepare_1.default;
|
|
6
6
|
const deploy_1 = require("./deploy");
|
|
7
7
|
exports.deploy = deploy_1.default;
|
|
8
8
|
const release_1 = require("./release");
|
|
9
9
|
exports.release = release_1.default;
|
|
10
|
+
exports.help = "Deploys security rules for Cloud Storage buckets defined in your project's firebase.json.";
|
|
11
|
+
exports.detailedHelp = "Cloud Storage deploys security rules to Storage buckets.\n\n" +
|
|
12
|
+
"Single bucket configuration in firebase.json:\n" +
|
|
13
|
+
"{\n" +
|
|
14
|
+
' "storage": {\n' +
|
|
15
|
+
' "rules": "storage.rules"\n' +
|
|
16
|
+
" }\n" +
|
|
17
|
+
"}\n\n" +
|
|
18
|
+
"Multiple buckets configuration (requires bucket name and rules file):\n" +
|
|
19
|
+
"{\n" +
|
|
20
|
+
' "storage": [\n' +
|
|
21
|
+
' { "bucket": "my-app-bucket-1", "rules": "storage-1.rules" },\n' +
|
|
22
|
+
' { "bucket": "my-app-bucket-2", "rules": "storage-2.rules", "target": "my-storage-target" }\n' +
|
|
23
|
+
" ]\n" +
|
|
24
|
+
"}";
|
package/lib/downloadUtils.js
CHANGED
|
@@ -10,6 +10,7 @@ const ProgressBar = require("progress");
|
|
|
10
10
|
const tmp = require("tmp");
|
|
11
11
|
const apiv2_1 = require("./apiv2");
|
|
12
12
|
const error_1 = require("./error");
|
|
13
|
+
const streamUtils_1 = require("./streamUtils");
|
|
13
14
|
async function downloadToTmp(remoteUrl, auth = false) {
|
|
14
15
|
const u = new url_1.URL(remoteUrl);
|
|
15
16
|
const c = new apiv2_1.Client({ urlPrefix: u.origin, auth });
|
|
@@ -24,7 +25,8 @@ async function downloadToTmp(remoteUrl, auth = false) {
|
|
|
24
25
|
resolveOnHTTPError: true,
|
|
25
26
|
});
|
|
26
27
|
if (res.status !== 200) {
|
|
27
|
-
|
|
28
|
+
const errorText = await (0, streamUtils_1.streamToString)(res.body);
|
|
29
|
+
throw new error_1.FirebaseError(`download failed, status ${res.status}: ${errorText}`, {
|
|
28
30
|
status: res.status,
|
|
29
31
|
});
|
|
30
32
|
}
|
|
@@ -6,8 +6,6 @@ exports.setAccountInfoImpl = setAccountInfoImpl;
|
|
|
6
6
|
exports.parseBlockingFunctionJwt = parseBlockingFunctionJwt;
|
|
7
7
|
const url_1 = require("url");
|
|
8
8
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
9
|
-
const node_fetch_1 = require("node-fetch");
|
|
10
|
-
const abort_controller_1 = require("abort-controller");
|
|
11
9
|
const utils_1 = require("./utils");
|
|
12
10
|
const errors_1 = require("./errors");
|
|
13
11
|
const types_1 = require("../types");
|
|
@@ -2183,7 +2181,7 @@ async function fetchBlockingFunction(state, event, user, options = {}, oauthToke
|
|
|
2183
2181
|
jwt,
|
|
2184
2182
|
},
|
|
2185
2183
|
};
|
|
2186
|
-
const controller = new
|
|
2184
|
+
const controller = new AbortController();
|
|
2187
2185
|
const timeout = setTimeout(() => {
|
|
2188
2186
|
controller.abort();
|
|
2189
2187
|
}, timeoutMs);
|
|
@@ -2193,11 +2191,23 @@ async function fetchBlockingFunction(state, event, user, options = {}, oauthToke
|
|
|
2193
2191
|
let text;
|
|
2194
2192
|
try {
|
|
2195
2193
|
const signal = controller.signal;
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
|
|
2200
|
-
|
|
2194
|
+
try {
|
|
2195
|
+
if (!("reason" in signal)) {
|
|
2196
|
+
signal.reason = "";
|
|
2197
|
+
}
|
|
2198
|
+
}
|
|
2199
|
+
catch (e) {
|
|
2200
|
+
}
|
|
2201
|
+
try {
|
|
2202
|
+
if (!("throwIfAborted" in signal)) {
|
|
2203
|
+
signal.throwIfAborted = () => {
|
|
2204
|
+
throw new error_1.FirebaseError("Aborted");
|
|
2205
|
+
};
|
|
2206
|
+
}
|
|
2207
|
+
}
|
|
2208
|
+
catch (e) {
|
|
2209
|
+
}
|
|
2210
|
+
const res = await fetch(url, {
|
|
2201
2211
|
method: "POST",
|
|
2202
2212
|
headers: { "Content-Type": "application/json" },
|
|
2203
2213
|
body: JSON.stringify(reqBody),
|
|
@@ -54,36 +54,36 @@
|
|
|
54
54
|
},
|
|
55
55
|
"dataconnect": {
|
|
56
56
|
"darwin": {
|
|
57
|
-
"version": "3.4.
|
|
58
|
-
"expectedSize":
|
|
59
|
-
"expectedChecksum": "
|
|
60
|
-
"expectedChecksumSHA256": "
|
|
61
|
-
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.
|
|
62
|
-
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.
|
|
57
|
+
"version": "3.4.16",
|
|
58
|
+
"expectedSize": 32877328,
|
|
59
|
+
"expectedChecksum": "48d472d8a9b009153d127bb0af9c0c77",
|
|
60
|
+
"expectedChecksumSHA256": "c4764168d79977047a8891ef52a450a4843b36d6d506e35a2147abeee01d7dd0",
|
|
61
|
+
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.16",
|
|
62
|
+
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.16"
|
|
63
63
|
},
|
|
64
64
|
"darwin_arm64": {
|
|
65
|
-
"version": "3.4.
|
|
66
|
-
"expectedSize":
|
|
67
|
-
"expectedChecksum": "
|
|
68
|
-
"expectedChecksumSHA256": "
|
|
69
|
-
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.
|
|
70
|
-
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.
|
|
65
|
+
"version": "3.4.16",
|
|
66
|
+
"expectedSize": 30995666,
|
|
67
|
+
"expectedChecksum": "71055082dbcf0a95451ac63839463a13",
|
|
68
|
+
"expectedChecksumSHA256": "b31dc5e60046474c66033209ac93105b91195fffa0a4a50bba73fda2cbb14ba7",
|
|
69
|
+
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.16",
|
|
70
|
+
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.16"
|
|
71
71
|
},
|
|
72
72
|
"win32": {
|
|
73
|
-
"version": "3.4.
|
|
74
|
-
"expectedSize":
|
|
75
|
-
"expectedChecksum": "
|
|
76
|
-
"expectedChecksumSHA256": "
|
|
77
|
-
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.
|
|
78
|
-
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.
|
|
73
|
+
"version": "3.4.16",
|
|
74
|
+
"expectedSize": 32919040,
|
|
75
|
+
"expectedChecksum": "d53acc32d9a996d99f8a8ac0abc82b04",
|
|
76
|
+
"expectedChecksumSHA256": "962f6cbc62d39da102d49c463f225846ce64438bc95bdc28ee8f35b92b7bd6ef",
|
|
77
|
+
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.16",
|
|
78
|
+
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.16.exe"
|
|
79
79
|
},
|
|
80
80
|
"linux": {
|
|
81
|
-
"version": "3.4.
|
|
82
|
-
"expectedSize":
|
|
83
|
-
"expectedChecksum": "
|
|
84
|
-
"expectedChecksumSHA256": "
|
|
85
|
-
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.
|
|
86
|
-
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.
|
|
81
|
+
"version": "3.4.16",
|
|
82
|
+
"expectedSize": 32030904,
|
|
83
|
+
"expectedChecksum": "240d642c408929e609d75eeeefe22689",
|
|
84
|
+
"expectedChecksumSHA256": "9963b3f1f011bf236a2a9908ebd7a282b79cd44405e77bdf8a566fd1c00dc4c7",
|
|
85
|
+
"remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.16",
|
|
86
|
+
"downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.16"
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -320,6 +320,67 @@ function createCloudEndpoints(emulator) {
|
|
|
320
320
|
}
|
|
321
321
|
return (0, shared_1.sendFileBytes)(getObjectResponse.metadata, getObjectResponse.data, req, res);
|
|
322
322
|
});
|
|
323
|
+
gcloudStorageAPI.post("/:bucketId", (req, res, next) => {
|
|
324
|
+
adminStorageLayer.createBucket(req.params.bucketId);
|
|
325
|
+
next();
|
|
326
|
+
}, async (req, res) => {
|
|
327
|
+
const contentTypeHeader = req.header("content-type");
|
|
328
|
+
if (!contentTypeHeader?.includes("multipart/form-data")) {
|
|
329
|
+
return res.status(400).send("Content-Type must be multipart/form-data");
|
|
330
|
+
}
|
|
331
|
+
try {
|
|
332
|
+
const bodyBuffer = await (0, request_1.reqBodyToBuffer)(req);
|
|
333
|
+
const formData = (0, multipart_1.parseFormDataMultipartRequest)(contentTypeHeader, bodyBuffer);
|
|
334
|
+
const keyPart = formData.find((p) => p.name === "key");
|
|
335
|
+
const filePart = formData.find((p) => p.type === "file");
|
|
336
|
+
if (keyPart?.type !== "field" || filePart?.type !== "file") {
|
|
337
|
+
return res.status(400).send("Missing 'key' or file.");
|
|
338
|
+
}
|
|
339
|
+
const metadata = {
|
|
340
|
+
contentType: filePart.contentType,
|
|
341
|
+
metadata: {},
|
|
342
|
+
};
|
|
343
|
+
const HEADER_MAP = {
|
|
344
|
+
"content-type": "contentType",
|
|
345
|
+
"cache-control": "cacheControl",
|
|
346
|
+
"content-disposition": "contentDisposition",
|
|
347
|
+
"content-encoding": "contentEncoding",
|
|
348
|
+
"content-language": "contentLanguage",
|
|
349
|
+
};
|
|
350
|
+
for (const part of formData) {
|
|
351
|
+
if (part.type === "file" || part.name === "key")
|
|
352
|
+
continue;
|
|
353
|
+
const key = part.name.toLowerCase();
|
|
354
|
+
if (key.startsWith("x-goog-meta-")) {
|
|
355
|
+
metadata.metadata[key.substring(12)] = part.value;
|
|
356
|
+
}
|
|
357
|
+
else if (HEADER_MAP[key]) {
|
|
358
|
+
metadata[HEADER_MAP[key]] = part.value.trim();
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
const upload = uploadService.multipartUpload({
|
|
362
|
+
bucketId: req.params.bucketId,
|
|
363
|
+
objectId: keyPart.value,
|
|
364
|
+
dataRaw: filePart.data,
|
|
365
|
+
metadata: metadata,
|
|
366
|
+
authorization: req.header("authorization"),
|
|
367
|
+
});
|
|
368
|
+
await adminStorageLayer.uploadObject(upload);
|
|
369
|
+
return res.sendStatus(204);
|
|
370
|
+
}
|
|
371
|
+
catch (err) {
|
|
372
|
+
if (err instanceof errors_1.ForbiddenError) {
|
|
373
|
+
return res.sendStatus(403);
|
|
374
|
+
}
|
|
375
|
+
if (err instanceof errors_1.NotFoundError) {
|
|
376
|
+
return res.sendStatus(404);
|
|
377
|
+
}
|
|
378
|
+
if (err instanceof Error) {
|
|
379
|
+
return res.status(400).send(err.message);
|
|
380
|
+
}
|
|
381
|
+
throw err;
|
|
382
|
+
}
|
|
383
|
+
});
|
|
323
384
|
gcloudStorageAPI.post("/b/:bucketId/o/:objectId/:method(rewriteTo|copyTo)/b/:destBucketId/o/:destObjectId", (req, res, next) => {
|
|
324
385
|
if (req.params.method === "rewriteTo" && req.query.rewriteToken) {
|
|
325
386
|
return next();
|