firebase-tools 10.6.0 → 10.7.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/command.js +4 -4
- package/lib/commands/deploy.js +1 -1
- package/lib/commands/emulators-start.js +7 -2
- package/lib/commands/ext-configure.js +15 -5
- package/lib/commands/ext-export.js +6 -5
- package/lib/commands/ext-install.js +28 -44
- package/lib/commands/ext-update.js +9 -1
- package/lib/commands/functions-delete.js +2 -5
- package/lib/commands/hosting-channel-deploy.js +2 -2
- package/lib/deploy/database/deploy.js +4 -0
- package/lib/deploy/database/index.js +1 -0
- package/lib/deploy/extensions/deploy.js +4 -4
- package/lib/deploy/extensions/deploymentSummary.js +8 -5
- package/lib/deploy/extensions/planner.js +36 -9
- package/lib/deploy/extensions/prepare.js +1 -1
- package/lib/deploy/extensions/secrets.js +2 -2
- package/lib/deploy/extensions/tasks.js +60 -21
- package/lib/deploy/functions/backend.js +17 -2
- package/lib/deploy/functions/build.js +162 -0
- package/lib/deploy/functions/checkIam.js +6 -5
- package/lib/deploy/functions/deploy.js +14 -15
- package/lib/deploy/functions/ensure.js +4 -4
- package/lib/deploy/functions/functionsDeployHelper.js +54 -23
- package/lib/deploy/functions/prepare.js +85 -42
- package/lib/deploy/functions/prepareFunctionsUpload.js +16 -21
- package/lib/deploy/functions/pricing.js +6 -3
- package/lib/deploy/functions/prompts.js +1 -7
- package/lib/deploy/functions/release/fabricator.js +43 -2
- package/lib/deploy/functions/release/index.js +10 -6
- package/lib/deploy/functions/release/planner.js +9 -6
- package/lib/deploy/functions/release/reporter.js +14 -11
- package/lib/deploy/functions/runtimes/discovery/parsing.js +12 -6
- package/lib/deploy/functions/runtimes/discovery/v1alpha1.js +50 -3
- package/lib/deploy/functions/runtimes/node/parseRuntimeAndValidateSDK.js +3 -3
- package/lib/deploy/functions/runtimes/node/parseTriggers.js +24 -5
- package/lib/deploy/functions/runtimes/node/versioning.js +2 -2
- package/lib/deploy/functions/services/auth.js +95 -0
- package/lib/deploy/functions/services/index.js +41 -21
- package/lib/deploy/functions/validate.js +8 -5
- package/lib/deploy/hosting/args.js +2 -0
- package/lib/deploy/hosting/convertConfig.js +37 -8
- package/lib/deploy/hosting/deploy.js +3 -3
- package/lib/deploy/hosting/prepare.js +2 -2
- package/lib/deploy/hosting/release.js +6 -2
- package/lib/deploy/index.js +82 -93
- package/lib/deploy/remoteconfig/deploy.js +4 -0
- package/lib/deploy/remoteconfig/index.js +3 -1
- package/lib/emulator/auth/operations.js +5 -0
- package/lib/emulator/auth/utils.js +3 -25
- package/lib/emulator/controller.js +5 -5
- package/lib/emulator/downloadableEmulators.js +39 -23
- package/lib/emulator/extensions/validation.js +2 -2
- package/lib/emulator/extensionsEmulator.js +85 -21
- package/lib/emulator/functionsEmulator.js +79 -7
- package/lib/emulator/functionsEmulatorShared.js +20 -1
- package/lib/emulator/registry.js +34 -12
- package/lib/emulator/storage/apis/firebase.js +7 -2
- package/lib/emulator/storage/apis/gcloud.js +6 -3
- package/lib/emulator/storage/files.js +9 -1
- package/lib/ensureApiEnabled.js +8 -4
- package/lib/extensions/changelog.js +1 -1
- package/lib/extensions/emulator/optionsHelper.js +4 -3
- package/lib/extensions/emulator/specHelper.js +7 -1
- package/lib/extensions/extensionsHelper.js +30 -24
- package/lib/extensions/manifest.js +27 -7
- package/lib/extensions/paramHelper.js +5 -5
- package/lib/extensions/provisioningHelper.js +2 -2
- package/lib/extensions/warnings.js +3 -3
- package/lib/functions/events/index.js +7 -0
- package/lib/functions/events/v1.js +6 -0
- package/lib/functions/projectConfig.js +24 -3
- package/lib/gcp/cloudfunctions.js +31 -5
- package/lib/gcp/cloudfunctionsv2.js +27 -2
- package/lib/gcp/identityPlatform.js +44 -0
- package/lib/gcp/secretManager.js +1 -1
- package/lib/metaprogramming.js +2 -0
- package/lib/previews.js +1 -1
- package/lib/serve/hosting.js +25 -12
- package/lib/serve/index.js +6 -0
- package/lib/track.js +15 -21
- package/npm-shrinkwrap.json +44 -2
- package/package.json +4 -1
- package/schema/firebase-config.json +6 -0
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AuthBlockingService = void 0;
|
|
4
|
+
const backend = require("../backend");
|
|
5
|
+
const identityPlatform = require("../../../gcp/identityPlatform");
|
|
6
|
+
const events = require("../../../functions/events");
|
|
7
|
+
const error_1 = require("../../../error");
|
|
8
|
+
const utils_1 = require("../../../utils");
|
|
9
|
+
const index_1 = require("./index");
|
|
10
|
+
class AuthBlockingService {
|
|
11
|
+
constructor() {
|
|
12
|
+
this.name = "authblocking";
|
|
13
|
+
this.api = "identitytoolkit.googleapis.com";
|
|
14
|
+
this.triggerQueue = Promise.resolve();
|
|
15
|
+
this.ensureTriggerRegion = index_1.noop;
|
|
16
|
+
}
|
|
17
|
+
validateTrigger(endpoint, wantBackend) {
|
|
18
|
+
if (!backend.isBlockingTriggered(endpoint)) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const blockingEndpoints = backend
|
|
22
|
+
.allEndpoints(wantBackend)
|
|
23
|
+
.filter((ep) => backend.isBlockingTriggered(ep));
|
|
24
|
+
if (blockingEndpoints.find((ep) => ep.blockingTrigger.eventType === endpoint.blockingTrigger.eventType &&
|
|
25
|
+
ep.id !== endpoint.id)) {
|
|
26
|
+
throw new error_1.FirebaseError(`Can only create at most one Auth Blocking Trigger for ${endpoint.blockingTrigger.eventType} events`);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
configChanged(newConfig, config) {
|
|
30
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
|
|
31
|
+
if (((_b = (_a = newConfig.triggers) === null || _a === void 0 ? void 0 : _a.beforeCreate) === null || _b === void 0 ? void 0 : _b.functionUri) !==
|
|
32
|
+
((_d = (_c = config.triggers) === null || _c === void 0 ? void 0 : _c.beforeCreate) === null || _d === void 0 ? void 0 : _d.functionUri) ||
|
|
33
|
+
((_f = (_e = newConfig.triggers) === null || _e === void 0 ? void 0 : _e.beforeSignIn) === null || _f === void 0 ? void 0 : _f.functionUri) !== ((_h = (_g = config.triggers) === null || _g === void 0 ? void 0 : _g.beforeSignIn) === null || _h === void 0 ? void 0 : _h.functionUri)) {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
if (!!((_j = newConfig.forwardInboundCredentials) === null || _j === void 0 ? void 0 : _j.accessToken) !==
|
|
37
|
+
!!((_k = config.forwardInboundCredentials) === null || _k === void 0 ? void 0 : _k.accessToken) ||
|
|
38
|
+
!!((_l = newConfig.forwardInboundCredentials) === null || _l === void 0 ? void 0 : _l.idToken) !==
|
|
39
|
+
!!((_m = config.forwardInboundCredentials) === null || _m === void 0 ? void 0 : _m.idToken) ||
|
|
40
|
+
!!((_o = newConfig.forwardInboundCredentials) === null || _o === void 0 ? void 0 : _o.refreshToken) !==
|
|
41
|
+
!!((_p = config.forwardInboundCredentials) === null || _p === void 0 ? void 0 : _p.refreshToken)) {
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
async registerTriggerLocked(endpoint) {
|
|
47
|
+
const newBlockingConfig = await identityPlatform.getBlockingFunctionsConfig(endpoint.project);
|
|
48
|
+
const oldBlockingConfig = (0, utils_1.cloneDeep)(newBlockingConfig);
|
|
49
|
+
if (endpoint.blockingTrigger.eventType === events.v1.BEFORE_CREATE_EVENT) {
|
|
50
|
+
newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeCreate: {
|
|
51
|
+
functionUri: endpoint.uri,
|
|
52
|
+
} });
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
newBlockingConfig.triggers = Object.assign(Object.assign({}, newBlockingConfig.triggers), { beforeSignIn: {
|
|
56
|
+
functionUri: endpoint.uri,
|
|
57
|
+
} });
|
|
58
|
+
}
|
|
59
|
+
newBlockingConfig.forwardInboundCredentials = Object.assign(Object.assign({}, oldBlockingConfig.forwardInboundCredentials), endpoint.blockingTrigger.options);
|
|
60
|
+
if (!this.configChanged(newBlockingConfig, oldBlockingConfig)) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
await identityPlatform.setBlockingFunctionsConfig(endpoint.project, newBlockingConfig);
|
|
64
|
+
}
|
|
65
|
+
registerTrigger(ep) {
|
|
66
|
+
if (!backend.isBlockingTriggered(ep)) {
|
|
67
|
+
return Promise.resolve();
|
|
68
|
+
}
|
|
69
|
+
this.triggerQueue = this.triggerQueue.then(() => this.registerTriggerLocked(ep));
|
|
70
|
+
return this.triggerQueue;
|
|
71
|
+
}
|
|
72
|
+
async unregisterTriggerLocked(endpoint) {
|
|
73
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
74
|
+
const blockingConfig = await identityPlatform.getBlockingFunctionsConfig(endpoint.project);
|
|
75
|
+
if (endpoint.uri !== ((_b = (_a = blockingConfig.triggers) === null || _a === void 0 ? void 0 : _a.beforeCreate) === null || _b === void 0 ? void 0 : _b.functionUri) &&
|
|
76
|
+
endpoint.uri !== ((_d = (_c = blockingConfig.triggers) === null || _c === void 0 ? void 0 : _c.beforeSignIn) === null || _d === void 0 ? void 0 : _d.functionUri)) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
if (endpoint.uri === ((_f = (_e = blockingConfig.triggers) === null || _e === void 0 ? void 0 : _e.beforeCreate) === null || _f === void 0 ? void 0 : _f.functionUri)) {
|
|
80
|
+
(_g = blockingConfig.triggers) === null || _g === void 0 ? true : delete _g.beforeCreate;
|
|
81
|
+
}
|
|
82
|
+
if (endpoint.uri === ((_j = (_h = blockingConfig.triggers) === null || _h === void 0 ? void 0 : _h.beforeSignIn) === null || _j === void 0 ? void 0 : _j.functionUri)) {
|
|
83
|
+
(_k = blockingConfig.triggers) === null || _k === void 0 ? true : delete _k.beforeSignIn;
|
|
84
|
+
}
|
|
85
|
+
await identityPlatform.setBlockingFunctionsConfig(endpoint.project, blockingConfig);
|
|
86
|
+
}
|
|
87
|
+
unregisterTrigger(ep) {
|
|
88
|
+
if (!backend.isBlockingTriggered(ep)) {
|
|
89
|
+
return Promise.resolve();
|
|
90
|
+
}
|
|
91
|
+
this.triggerQueue = this.triggerQueue.then(() => this.unregisterTriggerLocked(ep));
|
|
92
|
+
return this.triggerQueue;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
exports.AuthBlockingService = AuthBlockingService;
|
|
@@ -1,47 +1,67 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.serviceForEndpoint = exports.
|
|
3
|
+
exports.serviceForEndpoint = exports.noopProjectBindings = exports.noop = void 0;
|
|
4
4
|
const backend = require("../backend");
|
|
5
|
+
const auth_1 = require("./auth");
|
|
5
6
|
const storage_1 = require("./storage");
|
|
6
7
|
const firebaseAlerts_1 = require("./firebaseAlerts");
|
|
7
8
|
const noop = () => Promise.resolve();
|
|
9
|
+
exports.noop = noop;
|
|
8
10
|
const noopProjectBindings = () => Promise.resolve([]);
|
|
9
|
-
exports.
|
|
11
|
+
exports.noopProjectBindings = noopProjectBindings;
|
|
12
|
+
const noOpService = {
|
|
10
13
|
name: "noop",
|
|
11
14
|
api: "",
|
|
12
|
-
|
|
13
|
-
|
|
15
|
+
ensureTriggerRegion: exports.noop,
|
|
16
|
+
validateTrigger: exports.noop,
|
|
17
|
+
registerTrigger: exports.noop,
|
|
18
|
+
unregisterTrigger: exports.noop,
|
|
14
19
|
};
|
|
15
|
-
|
|
20
|
+
const pubSubService = {
|
|
16
21
|
name: "pubsub",
|
|
17
22
|
api: "pubsub.googleapis.com",
|
|
18
|
-
requiredProjectBindings:
|
|
19
|
-
ensureTriggerRegion: noop,
|
|
23
|
+
requiredProjectBindings: exports.noopProjectBindings,
|
|
24
|
+
ensureTriggerRegion: exports.noop,
|
|
25
|
+
validateTrigger: exports.noop,
|
|
26
|
+
registerTrigger: exports.noop,
|
|
27
|
+
unregisterTrigger: exports.noop,
|
|
20
28
|
};
|
|
21
|
-
|
|
29
|
+
const storageService = {
|
|
22
30
|
name: "storage",
|
|
23
31
|
api: "storage.googleapis.com",
|
|
24
32
|
requiredProjectBindings: storage_1.obtainStorageBindings,
|
|
25
33
|
ensureTriggerRegion: storage_1.ensureStorageTriggerRegion,
|
|
34
|
+
validateTrigger: exports.noop,
|
|
35
|
+
registerTrigger: exports.noop,
|
|
36
|
+
unregisterTrigger: exports.noop,
|
|
26
37
|
};
|
|
27
|
-
|
|
38
|
+
const firebaseAlertsService = {
|
|
28
39
|
name: "firebasealerts",
|
|
29
|
-
api: "
|
|
30
|
-
requiredProjectBindings: noopProjectBindings,
|
|
40
|
+
api: "firebasealerts.googleapis.com",
|
|
41
|
+
requiredProjectBindings: exports.noopProjectBindings,
|
|
31
42
|
ensureTriggerRegion: firebaseAlerts_1.ensureFirebaseAlertsTriggerRegion,
|
|
43
|
+
validateTrigger: exports.noop,
|
|
44
|
+
registerTrigger: exports.noop,
|
|
45
|
+
unregisterTrigger: exports.noop,
|
|
32
46
|
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
"google.cloud.
|
|
36
|
-
"google.cloud.storage.object.v1.
|
|
37
|
-
"google.cloud.storage.object.v1.
|
|
38
|
-
"google.cloud.storage.object.v1.
|
|
39
|
-
"google.
|
|
47
|
+
const authBlockingService = new auth_1.AuthBlockingService();
|
|
48
|
+
const EVENT_SERVICE_MAPPING = {
|
|
49
|
+
"google.cloud.pubsub.topic.v1.messagePublished": pubSubService,
|
|
50
|
+
"google.cloud.storage.object.v1.finalized": storageService,
|
|
51
|
+
"google.cloud.storage.object.v1.archived": storageService,
|
|
52
|
+
"google.cloud.storage.object.v1.deleted": storageService,
|
|
53
|
+
"google.cloud.storage.object.v1.metadataUpdated": storageService,
|
|
54
|
+
"google.firebase.firebasealerts.alerts.v1.published": firebaseAlertsService,
|
|
55
|
+
"providers/cloud.auth/eventTypes/user.beforeCreate": authBlockingService,
|
|
56
|
+
"providers/cloud.auth/eventTypes/user.beforeSignIn": authBlockingService,
|
|
40
57
|
};
|
|
41
58
|
function serviceForEndpoint(endpoint) {
|
|
42
|
-
if (
|
|
43
|
-
return
|
|
59
|
+
if (backend.isEventTriggered(endpoint)) {
|
|
60
|
+
return EVENT_SERVICE_MAPPING[endpoint.eventTrigger.eventType] || noOpService;
|
|
44
61
|
}
|
|
45
|
-
|
|
62
|
+
if (backend.isBlockingTriggered(endpoint)) {
|
|
63
|
+
return EVENT_SERVICE_MAPPING[endpoint.blockingTrigger.eventType] || noOpService;
|
|
64
|
+
}
|
|
65
|
+
return noOpService;
|
|
46
66
|
}
|
|
47
67
|
exports.serviceForEndpoint = serviceForEndpoint;
|
|
@@ -10,18 +10,21 @@ const fsutils = require("../../fsutils");
|
|
|
10
10
|
const backend = require("./backend");
|
|
11
11
|
const utils = require("../../utils");
|
|
12
12
|
const secrets = require("../../functions/secrets");
|
|
13
|
+
const services_1 = require("./services");
|
|
13
14
|
function endpointsAreValid(wantBackend) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
const endpoints = backend.allEndpoints(wantBackend);
|
|
16
|
+
functionIdsAreValid(endpoints);
|
|
17
|
+
for (const ep of endpoints) {
|
|
18
|
+
(0, services_1.serviceForEndpoint)(ep).validateTrigger(ep, wantBackend);
|
|
19
|
+
}
|
|
20
|
+
const gcfV1WithConcurrency = endpoints
|
|
17
21
|
.filter((endpoint) => (endpoint.concurrency || 1) !== 1 && endpoint.platform === "gcfv1")
|
|
18
22
|
.map((endpoint) => endpoint.id);
|
|
19
23
|
if (gcfV1WithConcurrency.length) {
|
|
20
24
|
const msg = `Cannot set concurrency on the functions ${gcfV1WithConcurrency.join(",")} because they are GCF gen 1`;
|
|
21
25
|
throw new error_1.FirebaseError(msg);
|
|
22
26
|
}
|
|
23
|
-
const tooSmallForConcurrency =
|
|
24
|
-
.allEndpoints(wantBackend)
|
|
27
|
+
const tooSmallForConcurrency = endpoints
|
|
25
28
|
.filter((endpoint) => {
|
|
26
29
|
if ((endpoint.concurrency || 1) === 1) {
|
|
27
30
|
return false;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convertConfig = void 0;
|
|
4
4
|
const error_1 = require("../../error");
|
|
5
|
+
const backend_1 = require("../functions/backend");
|
|
5
6
|
function has(obj, k) {
|
|
6
7
|
return obj[k] !== undefined;
|
|
7
8
|
}
|
|
@@ -28,7 +29,7 @@ function extractPattern(type, spec) {
|
|
|
28
29
|
}
|
|
29
30
|
throw new error_1.FirebaseError(`Cannot specify a ${type} with no pattern (either a glob or regex required).`);
|
|
30
31
|
}
|
|
31
|
-
function convertConfig(config) {
|
|
32
|
+
async function convertConfig(context, payload, config, finalize) {
|
|
32
33
|
if (Array.isArray(config)) {
|
|
33
34
|
throw new error_1.FirebaseError(`convertConfig should be given a single configuration, not an array.`, {
|
|
34
35
|
exit: 2,
|
|
@@ -38,29 +39,57 @@ function convertConfig(config) {
|
|
|
38
39
|
if (!config) {
|
|
39
40
|
return out;
|
|
40
41
|
}
|
|
42
|
+
const endpointBeingDeployed = (serviceId, region = "us-central1") => {
|
|
43
|
+
var _a, _b, _c;
|
|
44
|
+
const endpoint = (_c = (_b = (_a = payload.functions) === null || _a === void 0 ? void 0 : _a.wantBackend) === null || _b === void 0 ? void 0 : _b.endpoints[region]) === null || _c === void 0 ? void 0 : _c[serviceId];
|
|
45
|
+
if (endpoint && (0, backend_1.isHttpsTriggered)(endpoint) && endpoint.platform === "gcfv2")
|
|
46
|
+
return endpoint;
|
|
47
|
+
return undefined;
|
|
48
|
+
};
|
|
49
|
+
const matchingEndpoint = async (serviceId, region = "us-central1") => {
|
|
50
|
+
const pendingEndpoint = endpointBeingDeployed(serviceId, region);
|
|
51
|
+
if (pendingEndpoint)
|
|
52
|
+
return pendingEndpoint;
|
|
53
|
+
const backend = await (0, backend_1.existingBackend)(context);
|
|
54
|
+
return (0, backend_1.allEndpoints)(backend).find((it) => (0, backend_1.isHttpsTriggered)(it) &&
|
|
55
|
+
it.platform === "gcfv2" &&
|
|
56
|
+
it.id === serviceId &&
|
|
57
|
+
it.region === region);
|
|
58
|
+
};
|
|
41
59
|
if (Array.isArray(config.rewrites)) {
|
|
42
|
-
out.rewrites =
|
|
60
|
+
out.rewrites = [];
|
|
61
|
+
for (const rewrite of config.rewrites) {
|
|
43
62
|
const vRewrite = extractPattern("rewrite", rewrite);
|
|
44
63
|
if ("destination" in rewrite) {
|
|
45
64
|
vRewrite.path = rewrite.destination;
|
|
46
65
|
}
|
|
47
66
|
else if ("function" in rewrite) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
67
|
+
if (!finalize && endpointBeingDeployed(rewrite.function, rewrite.region))
|
|
68
|
+
continue;
|
|
69
|
+
const endpoint = await matchingEndpoint(rewrite.function, rewrite.region);
|
|
70
|
+
if (endpoint) {
|
|
71
|
+
vRewrite.run = { serviceId: endpoint.id, region: endpoint.region };
|
|
51
72
|
}
|
|
52
73
|
else {
|
|
53
|
-
vRewrite.
|
|
74
|
+
vRewrite.function = rewrite.function;
|
|
75
|
+
if (rewrite.region) {
|
|
76
|
+
vRewrite.functionRegion = rewrite.region;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
vRewrite.functionRegion = "us-central1";
|
|
80
|
+
}
|
|
54
81
|
}
|
|
55
82
|
}
|
|
56
83
|
else if ("dynamicLinks" in rewrite) {
|
|
57
84
|
vRewrite.dynamicLinks = rewrite.dynamicLinks;
|
|
58
85
|
}
|
|
59
86
|
else if ("run" in rewrite) {
|
|
87
|
+
if (!finalize && endpointBeingDeployed(rewrite.run.serviceId, rewrite.run.region))
|
|
88
|
+
continue;
|
|
60
89
|
vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
|
|
61
90
|
}
|
|
62
|
-
|
|
63
|
-
}
|
|
91
|
+
out.rewrites.push(vRewrite);
|
|
92
|
+
}
|
|
64
93
|
}
|
|
65
94
|
if (Array.isArray(config.redirects)) {
|
|
66
95
|
out.redirects = config.redirects.map((redirect) => {
|
|
@@ -5,7 +5,7 @@ const uploader_1 = require("./uploader");
|
|
|
5
5
|
const detectProjectRoot_1 = require("../../detectProjectRoot");
|
|
6
6
|
const listFiles_1 = require("../../listFiles");
|
|
7
7
|
const logger_1 = require("../../logger");
|
|
8
|
-
const
|
|
8
|
+
const track_1 = require("../../track");
|
|
9
9
|
const utils_1 = require("../../utils");
|
|
10
10
|
const clc = require("cli-color");
|
|
11
11
|
const SPINNER = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
|
|
@@ -63,7 +63,7 @@ async function deploy(context, options) {
|
|
|
63
63
|
await uploader.start();
|
|
64
64
|
}
|
|
65
65
|
catch (err) {
|
|
66
|
-
void track("Hosting Deploy", "failure");
|
|
66
|
+
void (0, track_1.track)("Hosting Deploy", "failure");
|
|
67
67
|
throw err;
|
|
68
68
|
}
|
|
69
69
|
finally {
|
|
@@ -75,7 +75,7 @@ async function deploy(context, options) {
|
|
|
75
75
|
(0, utils_1.logLabeledSuccess)("hosting[" + deploy.site + "]", "file upload complete");
|
|
76
76
|
const dt = Date.now() - t0;
|
|
77
77
|
logger_1.logger.debug("[hosting] deploy completed after " + dt + "ms");
|
|
78
|
-
void track("Hosting Deploy", "success", dt);
|
|
78
|
+
void (0, track_1.track)("Hosting Deploy", "success", dt);
|
|
79
79
|
return runDeploys(deploys, debugging);
|
|
80
80
|
}
|
|
81
81
|
const debugging = !!(options.debug || options.nonInteractive);
|
|
@@ -8,7 +8,7 @@ const normalizedHostingConfigs_1 = require("../../hosting/normalizedHostingConfi
|
|
|
8
8
|
const validate_1 = require("./validate");
|
|
9
9
|
const convertConfig_1 = require("./convertConfig");
|
|
10
10
|
const deploymentTool = require("../../deploymentTool");
|
|
11
|
-
async function prepare(context, options) {
|
|
11
|
+
async function prepare(context, options, payload) {
|
|
12
12
|
if (options.public) {
|
|
13
13
|
if (Array.isArray(options.config.get("hosting"))) {
|
|
14
14
|
throw new error_1.FirebaseError("Cannot specify --public option with multi-site configuration.");
|
|
@@ -30,7 +30,7 @@ async function prepare(context, options) {
|
|
|
30
30
|
const cfg = deploy.config;
|
|
31
31
|
(0, validate_1.validateDeploy)(deploy, options);
|
|
32
32
|
const data = {
|
|
33
|
-
config: (0, convertConfig_1.convertConfig)(cfg),
|
|
33
|
+
config: await (0, convertConfig_1.convertConfig)(context, payload, cfg, false),
|
|
34
34
|
labels: deploymentTool.labels(),
|
|
35
35
|
};
|
|
36
36
|
versionCreates.push(client_1.client
|
|
@@ -5,7 +5,8 @@ const client_1 = require("./client");
|
|
|
5
5
|
const logger_1 = require("../../logger");
|
|
6
6
|
const projectUtils_1 = require("../../projectUtils");
|
|
7
7
|
const utils = require("../../utils");
|
|
8
|
-
|
|
8
|
+
const convertConfig_1 = require("./convertConfig");
|
|
9
|
+
async function release(context, options, payload) {
|
|
9
10
|
if (!context.hosting || !context.hosting.deploys) {
|
|
10
11
|
return;
|
|
11
12
|
}
|
|
@@ -13,7 +14,10 @@ async function release(context, options) {
|
|
|
13
14
|
logger_1.logger.debug(JSON.stringify(context.hosting.deploys, null, 2));
|
|
14
15
|
await Promise.all(context.hosting.deploys.map(async (deploy) => {
|
|
15
16
|
utils.logLabeledBullet(`hosting[${deploy.site}]`, "finalizing version...");
|
|
16
|
-
const
|
|
17
|
+
const config = await (0, convertConfig_1.convertConfig)(context, payload, deploy.config, true);
|
|
18
|
+
const data = { status: "FINALIZED", config };
|
|
19
|
+
const queryParams = { updateMask: "status,config" };
|
|
20
|
+
const finalizeResult = await client_1.client.patch(`/${deploy.version}`, data, { queryParams });
|
|
17
21
|
logger_1.logger.debug(`[hosting] finalized version for ${deploy.site}:${finalizeResult.body}`);
|
|
18
22
|
utils.logLabeledSuccess(`hosting[${deploy.site}]`, "version finalized");
|
|
19
23
|
utils.logLabeledBullet(`hosting[${deploy.site}]`, "releasing new version...");
|
package/lib/deploy/index.js
CHANGED
|
@@ -1,103 +1,92 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.deploy = void 0;
|
|
4
|
+
const logger_1 = require("../logger");
|
|
5
|
+
const api_1 = require("../api");
|
|
6
|
+
const cli_color_1 = require("cli-color");
|
|
7
|
+
const lodash_1 = require("lodash");
|
|
8
|
+
const projectUtils_1 = require("../projectUtils");
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
|
+
const error_1 = require("../error");
|
|
11
|
+
const track_1 = require("../track");
|
|
12
|
+
const lifecycleHooks = require("./lifecycleHooks");
|
|
13
|
+
const previews_1 = require("../previews");
|
|
14
|
+
const HostingTarget = require("./hosting");
|
|
15
|
+
const DatabaseTarget = require("./database");
|
|
16
|
+
const FirestoreTarget = require("./firestore");
|
|
17
|
+
const FunctionsTarget = require("./functions");
|
|
18
|
+
const StorageTarget = require("./storage");
|
|
19
|
+
const RemoteConfigTarget = require("./remoteconfig");
|
|
20
|
+
const ExtensionsTarget = require("./extensions");
|
|
21
|
+
const TARGETS = {
|
|
22
|
+
hosting: HostingTarget,
|
|
23
|
+
database: DatabaseTarget,
|
|
24
|
+
firestore: FirestoreTarget,
|
|
25
|
+
functions: FunctionsTarget,
|
|
26
|
+
storage: StorageTarget,
|
|
27
|
+
remoteconfig: RemoteConfigTarget,
|
|
28
|
+
extensions: ExtensionsTarget,
|
|
19
29
|
};
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
var _chain = function (fns, context, options, payload) {
|
|
24
|
-
var latest = (fns.shift() || _noop)(context, options, payload);
|
|
25
|
-
if (fns.length) {
|
|
26
|
-
return latest.then(function () {
|
|
27
|
-
return _chain(fns, context, options, payload);
|
|
28
|
-
});
|
|
30
|
+
const chain = async function (fns, context, options, payload) {
|
|
31
|
+
for (const latest of fns) {
|
|
32
|
+
await latest(context, options, payload);
|
|
29
33
|
}
|
|
30
|
-
return latest;
|
|
31
34
|
};
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
35
|
+
const deploy = async function (targetNames, options, customContext = {}) {
|
|
36
|
+
const projectId = (0, projectUtils_1.needProjectId)(options);
|
|
37
|
+
const payload = {};
|
|
38
|
+
const context = Object.assign({ projectId }, customContext);
|
|
39
|
+
const predeploys = [];
|
|
40
|
+
const prepares = [];
|
|
41
|
+
const deploys = [];
|
|
42
|
+
const releases = [];
|
|
43
|
+
const postdeploys = [];
|
|
44
|
+
const startTime = Date.now();
|
|
45
|
+
if (previews_1.previews.frameworkawareness && targetNames.includes("hosting")) {
|
|
46
|
+
const config = options.config.get("hosting");
|
|
47
|
+
if (Array.isArray(config) ? config.some((it) => it.source) : config.source) {
|
|
48
|
+
await require("firebase-frameworks").prepare(targetNames, context, options);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
for (const targetName of targetNames) {
|
|
52
|
+
const target = TARGETS[targetName];
|
|
45
53
|
if (!target) {
|
|
46
|
-
return Promise.reject(new FirebaseError(
|
|
54
|
+
return Promise.reject(new error_1.FirebaseError((0, cli_color_1.bold)(targetName) + " is not a valid deploy target", { exit: 1 }));
|
|
47
55
|
}
|
|
48
56
|
predeploys.push(lifecycleHooks(targetName, "predeploy"));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
if (target.deploy) {
|
|
53
|
-
deploys.push(target.deploy);
|
|
54
|
-
}
|
|
55
|
-
if (target.release) {
|
|
56
|
-
releases.push(target.release);
|
|
57
|
-
}
|
|
57
|
+
prepares.push(target.prepare);
|
|
58
|
+
deploys.push(target.deploy);
|
|
59
|
+
releases.push(target.release);
|
|
58
60
|
postdeploys.push(lifecycleHooks(targetName, "postdeploy"));
|
|
59
61
|
}
|
|
60
|
-
logger.info();
|
|
61
|
-
logger.info(
|
|
62
|
-
logger.info();
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
.
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
utils.logSuccess(clc.underline.bold("Deploy complete!"));
|
|
90
|
-
logger.info();
|
|
91
|
-
var deployedHosting = _.includes(targetNames, "hosting");
|
|
92
|
-
logger.info(clc.bold("Project Console:"), utils.consoleUrl(options.project, "/overview"));
|
|
93
|
-
if (deployedHosting) {
|
|
94
|
-
_.each(context.hosting.deploys, function (deploy) {
|
|
95
|
-
logger.info(clc.bold("Hosting URL:"), utils.addSubdomain(api.hostingOrigin, deploy.site));
|
|
96
|
-
});
|
|
97
|
-
const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
|
|
98
|
-
return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };
|
|
99
|
-
}
|
|
100
|
-
});
|
|
62
|
+
logger_1.logger.info();
|
|
63
|
+
logger_1.logger.info((0, cli_color_1.bold)((0, cli_color_1.white)("===") + " Deploying to '" + projectId + "'..."));
|
|
64
|
+
logger_1.logger.info();
|
|
65
|
+
(0, utils_1.logBullet)("deploying " + (0, cli_color_1.bold)(targetNames.join(", ")));
|
|
66
|
+
await chain(predeploys, context, options, payload);
|
|
67
|
+
await chain(prepares, context, options, payload);
|
|
68
|
+
await chain(deploys, context, options, payload);
|
|
69
|
+
await chain(releases, context, options, payload);
|
|
70
|
+
await chain(postdeploys, context, options, payload);
|
|
71
|
+
if ((0, lodash_1.has)(options, "config.notes.databaseRules")) {
|
|
72
|
+
await (0, track_1.track)("Rules Deploy", options.config.notes.databaseRules);
|
|
73
|
+
}
|
|
74
|
+
const duration = Date.now() - startTime;
|
|
75
|
+
await (0, track_1.track)("Product Deploy", [...targetNames].sort().join(","), duration);
|
|
76
|
+
logger_1.logger.info();
|
|
77
|
+
(0, utils_1.logSuccess)(cli_color_1.bold.underline("Deploy complete!"));
|
|
78
|
+
logger_1.logger.info();
|
|
79
|
+
const deployedHosting = (0, lodash_1.includes)(targetNames, "hosting");
|
|
80
|
+
logger_1.logger.info((0, cli_color_1.bold)("Project Console:"), (0, utils_1.consoleUrl)(options.project, "/overview"));
|
|
81
|
+
if (deployedHosting) {
|
|
82
|
+
(0, lodash_1.each)(context.hosting.deploys, (deploy) => {
|
|
83
|
+
logger_1.logger.info((0, cli_color_1.bold)("Hosting URL:"), (0, utils_1.addSubdomain)(api_1.hostingOrigin, deploy.site));
|
|
84
|
+
});
|
|
85
|
+
const versionNames = context.hosting.deploys.map((deploy) => deploy.version);
|
|
86
|
+
return { hosting: versionNames.length === 1 ? versionNames[0] : versionNames };
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
return { hosting: undefined };
|
|
90
|
+
}
|
|
101
91
|
};
|
|
102
|
-
deploy
|
|
103
|
-
module.exports = deploy;
|
|
92
|
+
exports.deploy = deploy;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.release = exports.prepare = void 0;
|
|
3
|
+
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
|
+
const deploy_1 = require("./deploy");
|
|
9
|
+
exports.deploy = deploy_1.default;
|
|
@@ -39,6 +39,7 @@ exports.authOperations = {
|
|
|
39
39
|
projects: {
|
|
40
40
|
createSessionCookie,
|
|
41
41
|
queryAccounts,
|
|
42
|
+
getConfig,
|
|
42
43
|
updateConfig,
|
|
43
44
|
accounts: {
|
|
44
45
|
_: signUp,
|
|
@@ -1380,6 +1381,10 @@ function mfaSignInFinalize(state, reqBody) {
|
|
|
1380
1381
|
refreshToken,
|
|
1381
1382
|
};
|
|
1382
1383
|
}
|
|
1384
|
+
function getConfig(state, reqBody, ctx) {
|
|
1385
|
+
(0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Can only get top-level configurations on agent projects.))");
|
|
1386
|
+
return state.config;
|
|
1387
|
+
}
|
|
1383
1388
|
function updateConfig(state, reqBody, ctx) {
|
|
1384
1389
|
var _a;
|
|
1385
1390
|
(0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Can only update top-level configurations on agent projects.))");
|
|
@@ -64,34 +64,12 @@ function logError(err) {
|
|
|
64
64
|
}
|
|
65
65
|
exports.logError = logError;
|
|
66
66
|
function authEmulatorUrl(req) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
if (info) {
|
|
70
|
-
if (info.host === "0.0.0.0") {
|
|
71
|
-
url.hostname = "127.0.0.1";
|
|
72
|
-
}
|
|
73
|
-
else if (info.host === "::") {
|
|
74
|
-
url.hostname = "[::1]";
|
|
75
|
-
}
|
|
76
|
-
else if (info.host.includes(":")) {
|
|
77
|
-
url.hostname = `[${info.host}]`;
|
|
78
|
-
}
|
|
79
|
-
else {
|
|
80
|
-
url.hostname = info.host;
|
|
81
|
-
}
|
|
82
|
-
url.port = info.port.toString();
|
|
67
|
+
if (registry_1.EmulatorRegistry.getInfo(types_1.Emulators.AUTH)) {
|
|
68
|
+
return registry_1.EmulatorRegistry.url(types_1.Emulators.AUTH);
|
|
83
69
|
}
|
|
84
70
|
else {
|
|
85
|
-
|
|
86
|
-
url.protocol = req.protocol;
|
|
87
|
-
if (host) {
|
|
88
|
-
url.host = host;
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
console.warn("Cannot determine host and port of auth emulator server.");
|
|
92
|
-
}
|
|
71
|
+
return registry_1.EmulatorRegistry.url(types_1.Emulators.AUTH, req);
|
|
93
72
|
}
|
|
94
|
-
return url;
|
|
95
73
|
}
|
|
96
74
|
exports.authEmulatorUrl = authEmulatorUrl;
|
|
97
75
|
function mirrorFieldTo(dest, field, source) {
|