firebase-tools 15.29.0 → 15.30.1

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.
Files changed (38) hide show
  1. package/lib/commands/ext-export.js +28 -2
  2. package/lib/commands/ext-migrate.js +73 -4
  3. package/lib/commands/ext-uninstall.js +36 -23
  4. package/lib/commands/functions-kits-install.js +4 -1
  5. package/lib/commands/functions-kits-uninstall.js +25 -16
  6. package/lib/deploy/functions/build.js +9 -7
  7. package/lib/deploy/functions/delete.js +47 -22
  8. package/lib/deploy/functions/ensure.js +42 -2
  9. package/lib/deploy/functions/functionsDeployHelper.js +7 -0
  10. package/lib/deploy/functions/params.js +2 -1
  11. package/lib/deploy/functions/prepare.js +3 -4
  12. package/lib/deploy/functions/release/executor.js +14 -8
  13. package/lib/deploy/functions/release/fabricator.js +42 -20
  14. package/lib/deploy/functions/release/planner.js +2 -4
  15. package/lib/deploy/functions/release/sourceTokenScraper.js +16 -2
  16. package/lib/emulator/downloadableEmulatorInfo.json +31 -31
  17. package/lib/emulator/tasksEmulator.js +2 -2
  18. package/lib/extensions/export.js +64 -2
  19. package/lib/extensions/extensionsHelper.js +1 -2
  20. package/lib/extensions/manifest.js +5 -4
  21. package/lib/extensions/migrate.js +71 -2
  22. package/lib/functions/env.js +21 -4
  23. package/lib/functions/kits/install.js +27 -10
  24. package/lib/gcp/iam.js +8 -17
  25. package/lib/gcp/resourceManager.js +31 -22
  26. package/lib/gcp/run.js +2 -2
  27. package/lib/mcp/onemcp/index.js +19 -0
  28. package/lib/mcp/onemcp/onemcp_server.js +12 -7
  29. package/lib/mcp/tools/dataconnect/execute.js +33 -19
  30. package/lib/mcp/tools/dataconnect/index.js +1 -1
  31. package/lib/throttler/throttler.js +2 -11
  32. package/lib/tsconfig.compile.tsbuildinfo +1 -1
  33. package/lib/tsconfig.publish.tsbuildinfo +1 -1
  34. package/lib/utils.js +26 -0
  35. package/package.json +1 -1
  36. package/templates/init/functions/typescript/index-kit-migration.ts +1 -0
  37. package/templates/init/functions/typescript/index-kit.ts +1 -0
  38. package/templates/init/functions/typescript/tsconfig.json +2 -1
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.InlineExecutor = exports.QueueExecutor = exports.isCloudRunResourceExhausted = exports.isServiceAccount404 = exports.isTransientError = exports.isServiceUnavailable = exports.isConflict = exports.isQuotaExhaustion = void 0;
3
+ exports.InlineExecutor = exports.QueueExecutor = exports.isCloudRunResourceExhausted = exports.isServiceAccountPropagationError = exports.isTransientError = exports.isServiceUnavailable = exports.isConflict = exports.isQuotaExhaustion = void 0;
4
4
  exports.parseErrorCode = parseErrorCode;
5
5
  exports.hasErrorCode = hasErrorCode;
6
6
  const queue_1 = require("../../../throttler/queue");
@@ -22,8 +22,9 @@ const isServiceUnavailable = (err) => parseErrorCode(err) === 503;
22
22
  exports.isServiceUnavailable = isServiceUnavailable;
23
23
  const isTransientError = (err) => (0, exports.isQuotaExhaustion)(err) || (0, exports.isConflict)(err) || (0, exports.isServiceUnavailable)(err);
24
24
  exports.isTransientError = isTransientError;
25
- const isServiceAccount404 = (err) => {
26
- if (parseErrorCode(err) !== 404) {
25
+ const isServiceAccountPropagationError = (err) => {
26
+ const code = parseErrorCode(err);
27
+ if (code !== 404 && code !== 400) {
27
28
  return false;
28
29
  }
29
30
  let message = "";
@@ -32,6 +33,7 @@ const isServiceAccount404 = (err) => {
32
33
  err?.message,
33
34
  err?.original?.message,
34
35
  err?.context?.body?.error?.message,
36
+ err?.original?.context?.body?.error?.message,
35
37
  String(err),
36
38
  ]
37
39
  .filter(Boolean)
@@ -41,12 +43,16 @@ const isServiceAccount404 = (err) => {
41
43
  catch {
42
44
  message = String(err).toLowerCase();
43
45
  }
44
- return (message.includes("serviceaccount") ||
45
- message.includes("service account") ||
46
- /\b[a-z0-9._%+-]+@[a-z0-9.-]+\.gserviceaccount\.com\b/i.test(message) ||
47
- /\bgserviceaccount\.com\b/i.test(message));
46
+ const hasSa = message.includes("serviceaccount") || message.includes("service account");
47
+ if (!hasSa) {
48
+ return false;
49
+ }
50
+ if (code === 404) {
51
+ return true;
52
+ }
53
+ return message.includes("invalid service account") && /\bfirebase-fn-[0-9]+@/i.test(message);
48
54
  };
49
- exports.isServiceAccount404 = isServiceAccount404;
55
+ exports.isServiceAccountPropagationError = isServiceAccountPropagationError;
50
56
  const isCloudRunResourceExhausted = (err) => parseErrorCode(err) === 8;
51
57
  exports.isCloudRunResourceExhausted = isCloudRunResourceExhausted;
52
58
  async function handler(op) {
@@ -160,7 +160,7 @@ class Fabricator {
160
160
  secret,
161
161
  serviceAccounts,
162
162
  }), {
163
- retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccount404],
163
+ retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccountPropagationError],
164
164
  })));
165
165
  await Promise.all(secretAccessPromises);
166
166
  const allChangesets = [];
@@ -325,16 +325,19 @@ class Fabricator {
325
325
  apiFunction.httpsTrigger.securityLevel = "SECURE_ALWAYS";
326
326
  }
327
327
  const resultFunction = await this.functionExecutor
328
- .run(async () => {
329
- apiFunction.sourceToken = await scraper.getToken();
328
+ .run(() => scraper.withToken(async (token) => {
329
+ delete apiFunction.sourceToken;
330
+ if (token) {
331
+ apiFunction.sourceToken = token;
332
+ }
330
333
  const op = await gcf.createFunction(apiFunction);
331
- return poller.pollOperation({
334
+ return await poller.pollOperation({
332
335
  ...gcfV1PollerOptions,
333
336
  pollerName: `create-${endpoint.codebase}-${endpoint.region}-${endpoint.id}`,
334
337
  operationResourceName: op.name,
335
338
  onPoll: scraper.poller,
336
339
  });
337
- }, { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccount404] })
340
+ }), { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccountPropagationError] })
338
341
  .catch(rethrowAs(endpoint, "create"));
339
342
  endpoint.uri = resultFunction?.httpsTrigger?.url;
340
343
  if (backend.isHttpsTriggered(endpoint)) {
@@ -429,9 +432,12 @@ class Fabricator {
429
432
  let resultFunction = null;
430
433
  while (!resultFunction) {
431
434
  resultFunction = await this.functionExecutor
432
- .run(async () => {
433
- if (experiments.isEnabled("functionsv2deployoptimizations")) {
434
- apiFunction.buildConfig.sourceToken = await scraper.getToken();
435
+ .run(() => scraper.withToken(async (token) => {
436
+ if (apiFunction.buildConfig) {
437
+ delete apiFunction.buildConfig.sourceToken;
438
+ if (experiments.isEnabled("functionsv2deployoptimizations") && token) {
439
+ apiFunction.buildConfig.sourceToken = token;
440
+ }
435
441
  }
436
442
  const op = await gcfV2.createFunction(apiFunction);
437
443
  return await poller.pollOperation({
@@ -440,9 +446,8 @@ class Fabricator {
440
446
  operationResourceName: op.name,
441
447
  onPoll: scraper.poller,
442
448
  });
443
- }, { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccount404] })
449
+ }), { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccountPropagationError] })
444
450
  .catch(async (err) => {
445
- scraper.abort();
446
451
  if (err.code === CLOUD_RUN_RESOURCE_EXHAUSTED_CODE) {
447
452
  await this.deleteV2Function(endpoint);
448
453
  return null;
@@ -516,8 +521,11 @@ class Fabricator {
516
521
  }
517
522
  const apiFunction = gcf.functionFromEndpoint(endpoint, sourceUrl);
518
523
  const resultFunction = await this.functionExecutor
519
- .run(async () => {
520
- apiFunction.sourceToken = await scraper.getToken();
524
+ .run(() => scraper.withToken(async (token) => {
525
+ delete apiFunction.sourceToken;
526
+ if (token) {
527
+ apiFunction.sourceToken = token;
528
+ }
521
529
  const op = await gcf.updateFunction(apiFunction);
522
530
  return await poller.pollOperation({
523
531
  ...gcfV1PollerOptions,
@@ -525,7 +533,7 @@ class Fabricator {
525
533
  operationResourceName: op.name,
526
534
  onPoll: scraper.poller,
527
535
  });
528
- })
536
+ }), { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccountPropagationError] })
529
537
  .catch(rethrowAs(endpoint, "update"));
530
538
  endpoint.uri = resultFunction?.httpsTrigger?.url;
531
539
  let invoker;
@@ -556,9 +564,12 @@ class Fabricator {
556
564
  delete apiFunction.eventTrigger.pubsubTopic;
557
565
  }
558
566
  const resultFunction = await this.functionExecutor
559
- .run(async () => {
560
- if (experiments.isEnabled("functionsv2deployoptimizations")) {
561
- apiFunction.buildConfig.sourceToken = await scraper.getToken();
567
+ .run(() => scraper.withToken(async (token) => {
568
+ if (apiFunction.buildConfig) {
569
+ delete apiFunction.buildConfig.sourceToken;
570
+ if (experiments.isEnabled("functionsv2deployoptimizations") && token) {
571
+ apiFunction.buildConfig.sourceToken = token;
572
+ }
562
573
  }
563
574
  const op = await gcfV2.updateFunction(apiFunction);
564
575
  return await poller.pollOperation({
@@ -567,9 +578,14 @@ class Fabricator {
567
578
  operationResourceName: op.name,
568
579
  onPoll: scraper.poller,
569
580
  });
570
- }, { retryPredicates: [executor_1.isTransientError, executor_1.isCloudRunResourceExhausted, executor_1.isServiceAccount404] })
581
+ }), {
582
+ retryPredicates: [
583
+ executor_1.isTransientError,
584
+ executor_1.isCloudRunResourceExhausted,
585
+ executor_1.isServiceAccountPropagationError,
586
+ ],
587
+ })
571
588
  .catch((err) => {
572
- scraper.abort();
573
589
  logger_1.logger.error(err.message);
574
590
  throw new reporter.DeploymentError(endpoint, "update", err);
575
591
  });
@@ -637,7 +653,13 @@ class Fabricator {
637
653
  operationResourceName: op.name,
638
654
  };
639
655
  await poller.pollOperation(pollerOptions);
640
- }, { retryPredicates: [executor_1.isTransientError, executor_1.isCloudRunResourceExhausted, executor_1.isServiceAccount404] })
656
+ }, {
657
+ retryPredicates: [
658
+ executor_1.isTransientError,
659
+ executor_1.isCloudRunResourceExhausted,
660
+ executor_1.isServiceAccountPropagationError,
661
+ ],
662
+ })
641
663
  .catch(rethrowAs(endpoint, "delete"));
642
664
  }
643
665
  async createRunFunction(endpoint) {
@@ -660,7 +682,7 @@ class Fabricator {
660
682
  const op = await runV2.createService(endpoint.project, endpoint.region, endpoint.id, service);
661
683
  endpoint.uri = op.uri;
662
684
  endpoint.runServiceId = endpoint.id;
663
- }, { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccount404] })
685
+ }, { retryPredicates: [executor_1.isTransientError, executor_1.isServiceAccountPropagationError] })
664
686
  .catch(rethrowAs(endpoint, "create"));
665
687
  const serviceName = `projects/${endpoint.project}/locations/${endpoint.region}/services/${endpoint.runServiceId}`;
666
688
  if (backend.isHttpsTriggered(endpoint)) {
@@ -84,9 +84,7 @@ async function createDeploymentPlan(args) {
84
84
  let rolesToRemove;
85
85
  let serviceAccountToCreate;
86
86
  let serviceAccountToDelete;
87
- const isFiltered = !!(filters &&
88
- filters.some((f) => f.idChunks && f.idChunks.length > 0) &&
89
- !deleteAll);
87
+ const isPartiallyFiltered = (0, functionsDeployHelper_1.isCodebasePartiallyFiltered)(codebase, filters);
90
88
  const hasWantEndpoints = backend.someEndpoint(wantBackend, () => true);
91
89
  if (requiredRoles && hasWantEndpoints) {
92
90
  rolesToAdd = requiredRoles.filter((r) => !roles.includes(r));
@@ -95,7 +93,7 @@ async function createDeploymentPlan(args) {
95
93
  serviceAccountToCreate = managedSA;
96
94
  }
97
95
  }
98
- else if (existingManagedSA && !isFiltered) {
96
+ else if (existingManagedSA && (!isPartiallyFiltered || deleteAll)) {
99
97
  serviceAccountToDelete = existingManagedSA;
100
98
  }
101
99
  wantBackend = backend.matchingBackend(wantBackend, (endpoint) => {
@@ -10,8 +10,23 @@ class SourceTokenScraper {
10
10
  this.promise = new Promise((resolve) => (this.resolve = resolve));
11
11
  this.fetchState = "NONE";
12
12
  }
13
+ async withToken(fn) {
14
+ const token = await this.getToken();
15
+ try {
16
+ return await fn(token);
17
+ }
18
+ catch (err) {
19
+ this.abort();
20
+ throw err;
21
+ }
22
+ }
13
23
  abort() {
14
- this.resolve({ aborted: true });
24
+ if (this.fetchState === "FETCHING") {
25
+ this.fetchState = "NONE";
26
+ const resolve = this.resolve;
27
+ this.promise = new Promise((r) => (this.resolve = r));
28
+ resolve({ aborted: true });
29
+ }
15
30
  }
16
31
  async getToken() {
17
32
  if (this.fetchState === "NONE") {
@@ -21,7 +36,6 @@ class SourceTokenScraper {
21
36
  else if (this.fetchState === "FETCHING") {
22
37
  const tokenResult = await this.promise;
23
38
  if (tokenResult.aborted) {
24
- this.promise = new Promise((resolve) => (this.resolve = resolve));
25
39
  return undefined;
26
40
  }
27
41
  return tokenResult.token;
@@ -44,46 +44,46 @@
44
44
  }
45
45
  },
46
46
  "pubsub": {
47
- "version": "0.8.35",
48
- "expectedSize": 53015972,
49
- "expectedChecksum": "04cb782e3edf7a2b117990af8506453e",
50
- "expectedChecksumSHA256": "b0f3b73a14b716ecf8925b7b8a0c8c858ffabddcf03df8b2b7fba682f48dc616",
51
- "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.35.zip",
52
- "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.35.zip",
53
- "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.35/pubsub-emulator/bin/cloud-pubsub-emulator"
47
+ "version": "0.8.36",
48
+ "expectedSize": 53026271,
49
+ "expectedChecksum": "f62d997f52619f4800f34f42136178ef",
50
+ "expectedChecksumSHA256": "0b3a030b3a92aba50082aeed7ee63008a45b032b7231090d3a1bcd8744e0e2e5",
51
+ "remoteUrl": "https://storage.googleapis.com/firebase-preview-drop/emulator/pubsub-emulator-0.8.36.zip",
52
+ "downloadPathRelativeToCacheDir": "pubsub-emulator-0.8.36.zip",
53
+ "binaryPathRelativeToCacheDir": "pubsub-emulator-0.8.36/pubsub-emulator/bin/cloud-pubsub-emulator"
54
54
  },
55
55
  "dataconnect": {
56
56
  "darwin": {
57
- "version": "3.4.18",
58
- "expectedSize": 33375408,
59
- "expectedChecksum": "e38f131497fc43df55c3a47ee87e7fd4",
60
- "expectedChecksumSHA256": "52518fefdd2e52581b0d8d035c6498f304ac493d3757f4fd35851b1f028a9460",
61
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.18",
62
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
57
+ "version": "3.4.19",
58
+ "expectedSize": 33412928,
59
+ "expectedChecksum": "5a65cd626d5c022eab4c2036b18f0314",
60
+ "expectedChecksumSHA256": "4a63243e720d26de7e2e5bd5060fc92768f09446ec42b3369fb6ddc06a9cdddf",
61
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-amd64-v3.4.19",
62
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
63
63
  },
64
64
  "darwin_arm64": {
65
- "version": "3.4.18",
66
- "expectedSize": 31505922,
67
- "expectedChecksum": "6a7cfdd68a7671bb660eb8489372a890",
68
- "expectedChecksumSHA256": "96cdec1fd6561af5c10f915f6f3bfd59a7405bf5e9b8fabfedb40cd57d6d5d76",
69
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.18",
70
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
65
+ "version": "3.4.19",
66
+ "expectedSize": 31539602,
67
+ "expectedChecksum": "cd914718f705a9e614bc3024f443bb52",
68
+ "expectedChecksumSHA256": "dafb2e532c29d876cb30d5c2bf32b2e50a614386dc16ba82b0ed6a9fca2a6db3",
69
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-macos-arm64-v3.4.19",
70
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
71
71
  },
72
72
  "win32": {
73
- "version": "3.4.18",
74
- "expectedSize": 33414144,
75
- "expectedChecksum": "d2504c643ac8355b90aa31be7575807c",
76
- "expectedChecksumSHA256": "a92f2d01950af613d28b92c2cd7baa85e7629fa201b8ff8dddce73d5584dccc5",
77
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.18",
78
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18.exe"
73
+ "version": "3.4.19",
74
+ "expectedSize": 33444864,
75
+ "expectedChecksum": "e2f84df8d6c536bea29d2ccc4cb21e79",
76
+ "expectedChecksumSHA256": "756e370334ef982547e7252b3f91fd75b35f85c5d3666e8f3773a4a19a00c8f8",
77
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-windows-amd64-v3.4.19",
78
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19.exe"
79
79
  },
80
80
  "linux": {
81
- "version": "3.4.18",
82
- "expectedSize": 32510136,
83
- "expectedChecksum": "c8b4640f3ea59c813a708814bd2c0f8c",
84
- "expectedChecksumSHA256": "bb381de594485653812bee518ddae025c13e1050670d6fa186f6003c3c9b71ec",
85
- "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.18",
86
- "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.18"
81
+ "version": "3.4.19",
82
+ "expectedSize": 32542904,
83
+ "expectedChecksum": "63f099c9b9dad6e7d2adddae8af884a3",
84
+ "expectedChecksumSHA256": "bc74b68cc4bafcccc57dbe659a74b4403c225f01f851b5a4a61dcea81e8b1310",
85
+ "remoteUrl": "https://storage.googleapis.com/firemat-preview-drop/emulator/dataconnect-emulator-linux-amd64-v3.4.19",
86
+ "downloadPathRelativeToCacheDir": "dataconnect-emulator-3.4.19"
87
87
  }
88
88
  }
89
89
  }
@@ -116,8 +116,8 @@ class TasksEmulator {
116
116
  const queueName = req.params.queue_name;
117
117
  if (!this.validateQueueId(queueName)) {
118
118
  res.status(400).json({
119
- error: "Queue ID must start with a letter followed by up to 62 letters, numbers, " +
120
- "hyphens, or underscores and must end with a letter or a number",
119
+ error: "Queue ID can contain only letters ([A-Za-z]), numbers ([0-9]), or hyphens (-). Queue ID " +
120
+ "must be between 1 and 100 characters.",
121
121
  });
122
122
  return;
123
123
  }
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parameterizeProject = parameterizeProject;
4
4
  exports.setSecretParamsToLatest = setSecretParamsToLatest;
5
5
  exports.displayExportInfo = displayExportInfo;
6
+ exports.memoryToMb = memoryToMb;
7
+ exports.parseMemory = parseMemory;
8
+ exports.resolveMigratedMemory = resolveMigratedMemory;
6
9
  exports.functionsEnvFromInstance = functionsEnvFromInstance;
7
10
  exports.secretsNeedingEjection = secretsNeedingEjection;
8
11
  exports.ejectSecretsFromInstance = ejectSecretsFromInstance;
@@ -66,6 +69,58 @@ function displaySpecs(specs) {
66
69
  logger_1.logger.info("");
67
70
  }
68
71
  }
72
+ const GIB_REGEX = /^\d+(?:\.\d+)?(?:Gi|GiB|G|GB)$/i;
73
+ const MIB_REGEX = /^\d+(?:\.\d+)?(?:Mi|MiB|M|MB)?$/i;
74
+ function memoryToMb(memory) {
75
+ if (!memory) {
76
+ return 0;
77
+ }
78
+ const trimmed = memory.trim();
79
+ if (GIB_REGEX.test(trimmed)) {
80
+ return Math.round(parseFloat(trimmed) * 1024);
81
+ }
82
+ if (MIB_REGEX.test(trimmed)) {
83
+ const parsed = parseFloat(trimmed);
84
+ return isNaN(parsed) || parsed < 0 ? 0 : parsed;
85
+ }
86
+ return 0;
87
+ }
88
+ const MB_TO_MEMORY_OPTION = {
89
+ 128: "128MiB",
90
+ 256: "256MiB",
91
+ 512: "512MiB",
92
+ 1024: "1GiB",
93
+ 2048: "2GiB",
94
+ 4096: "4GiB",
95
+ 8192: "8GiB",
96
+ 16384: "16GiB",
97
+ 32768: "32GiB",
98
+ };
99
+ function parseMemory(raw) {
100
+ if (!raw) {
101
+ return undefined;
102
+ }
103
+ const mb = memoryToMb(raw);
104
+ return MB_TO_MEMORY_OPTION[mb];
105
+ }
106
+ const V1_MEMORY_PARAM = "firebaseextensions.v1beta.function/memory";
107
+ const V2_MEMORY_PARAM = "firebaseextensions.v1beta.v2function/memory";
108
+ const MEMORY_PARAMS = new Set([V1_MEMORY_PARAM, V2_MEMORY_PARAM]);
109
+ function resolveMigratedMemory(liveSystemParams = {}, specSystemParams = []) {
110
+ const getParam = (paramName) => {
111
+ if (paramName in liveSystemParams) {
112
+ return liveSystemParams[paramName];
113
+ }
114
+ const defaultVal = specSystemParams.find((p) => p.param === paramName)?.default;
115
+ return defaultVal !== undefined ? String(defaultVal) : undefined;
116
+ };
117
+ const v1 = getParam(V1_MEMORY_PARAM);
118
+ const v2 = getParam(V2_MEMORY_PARAM);
119
+ if (v1 && v2) {
120
+ return memoryToMb(v1) > memoryToMb(v2) ? v1 : v2;
121
+ }
122
+ return v2 ?? v1;
123
+ }
69
124
  function functionsEnvFromInstance(instance) {
70
125
  const liveParams = instance.config?.params || {};
71
126
  const liveSystemParams = instance.config?.systemParams || {};
@@ -85,6 +140,9 @@ function functionsEnvFromInstance(instance) {
85
140
  }
86
141
  });
87
142
  for (const [sysParamName, sysParamValue] of Object.entries(liveSystemParams)) {
143
+ if (MEMORY_PARAMS.has(sysParamName)) {
144
+ continue;
145
+ }
88
146
  let renamed = sysParamName
89
147
  .replace(/^firebaseextensions\.v1beta\.(v2)?function\//, "EXT_MIGRATED_SYSTEM_")
90
148
  .toUpperCase();
@@ -94,7 +152,7 @@ function functionsEnvFromInstance(instance) {
94
152
  envs[renamed] = sysParamValue;
95
153
  }
96
154
  for (const specSystemParam of specSystemParams) {
97
- if (specSystemParam.param in liveSystemParams) {
155
+ if (specSystemParam.param in liveSystemParams || MEMORY_PARAMS.has(specSystemParam.param)) {
98
156
  continue;
99
157
  }
100
158
  if ("default" in specSystemParam) {
@@ -104,9 +162,13 @@ function functionsEnvFromInstance(instance) {
104
162
  if (renamed === "EXT_MIGRATED_SYSTEM_LOCATION") {
105
163
  renamed = "FUNCTION_DEFAULT_REGION";
106
164
  }
107
- envs[renamed] = specSystemParam.default ?? "";
165
+ envs[renamed] = String(specSystemParam.default ?? "");
108
166
  }
109
167
  }
168
+ const memory = resolveMigratedMemory(liveSystemParams, specSystemParams);
169
+ if (memory) {
170
+ envs["EXT_MIGRATED_SYSTEM_MEMORY"] = parseMemory(memory) ?? memory;
171
+ }
110
172
  if (typeof instance.config.allowedEventTypes !== "undefined") {
111
173
  envs["EXT_SELECTED_EVENTS"] = instance.config.allowedEventTypes.toString();
112
174
  }
@@ -162,8 +162,7 @@ async function substituteSecretParams(projectNumber, params) {
162
162
  const newParams = {};
163
163
  for await (const [key, value] of Object.entries(params)) {
164
164
  if (typeof value !== "string") {
165
- newParams[key] =
166
- `projects/${projectNumber}/secrets/${value.name}/versions/latest`;
165
+ newParams[key] = `projects/${projectNumber}/secrets/${value.name}/versions/latest`;
167
166
  }
168
167
  else {
169
168
  newParams[key] = value;
@@ -21,6 +21,7 @@ const prompt_1 = require("../prompt");
21
21
  const paramHelper_1 = require("./paramHelper");
22
22
  const error_1 = require("../error");
23
23
  const extensionsHelper_1 = require("./extensionsHelper");
24
+ const utils_1 = require("../utils");
24
25
  const types_1 = require("./types");
25
26
  exports.ENV_DIRECTORY = "extensions";
26
27
  async function writeToManifest(specs, config, options, allowOverwrite = false) {
@@ -99,16 +100,16 @@ function removeFromManifest(instanceId, config) {
99
100
  extensions[instanceId] = undefined;
100
101
  config.set("extensions", extensions);
101
102
  config.writeProjectFile("firebase.json", config.src);
102
- logger_1.logger.info(`Removed extension instance ${instanceId} from firebase.json`);
103
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance ${instanceId} from firebase.json`);
103
104
  config.deleteProjectFile(`extensions/${instanceId}.env`);
104
- logger_1.logger.info(`Removed extension instance environment config extensions/${instanceId}.env`);
105
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance environment config extensions/${instanceId}.env`);
105
106
  if (config.projectFileExists(`extensions/${instanceId}.env.local`)) {
106
107
  config.deleteProjectFile(`extensions/${instanceId}.env.local`);
107
- logger_1.logger.info(`Removed extension instance local environment config extensions/${instanceId}.env.local`);
108
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance local environment config extensions/${instanceId}.env.local`);
108
109
  }
109
110
  if (config.projectFileExists(`extensions/${instanceId}.secret.local`)) {
110
111
  config.deleteProjectFile(`extensions/${instanceId}.secret.local`);
111
- logger_1.logger.info(`Removed extension instance local secret config extensions/${instanceId}.secret.local`);
112
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Removed extension instance local secret config extensions/${instanceId}.secret.local`);
112
113
  }
113
114
  }
114
115
  function loadConfig(options) {
@@ -8,6 +8,8 @@ exports.getMigratableInstances = getMigratableInstances;
8
8
  exports.promptInstanceSelection = promptInstanceSelection;
9
9
  exports.createMigrationPlan = createMigrationPlan;
10
10
  exports.ensureInstanceUpToDate = ensureInstanceUpToDate;
11
+ exports.migrateSecrets = migrateSecrets;
12
+ exports.uninstallExtension = uninstallExtension;
11
13
  const clc = require("colorette");
12
14
  const Table = require("cli-table3");
13
15
  const error_1 = require("../error");
@@ -20,6 +22,8 @@ const refs = require("./refs");
20
22
  const paramHelper = require("./paramHelper");
21
23
  const updateHelper = require("./updateHelper");
22
24
  const replacements = require("./replacements.json");
25
+ const export_1 = require("./export");
26
+ const manifest = require("./manifest");
23
27
  function getKitPackage(extensionRef, packageOverride) {
24
28
  if (packageOverride) {
25
29
  return packageOverride;
@@ -218,7 +222,11 @@ async function ensureInstanceUpToDate(projectId, instance, options) {
218
222
  try {
219
223
  const parsed = refs.parse(rawRef);
220
224
  baseRef = refs.toExtensionRef(parsed);
221
- currentVersion = parsed.version || instance.config.source?.spec?.version;
225
+ currentVersion =
226
+ parsed.version ||
227
+ instance.config?.source?.spec?.version ||
228
+ instance.config?.extensionVersion ||
229
+ instance.extensionVersion;
222
230
  }
223
231
  catch (err) {
224
232
  logger_1.logger.debug(`[ensureInstanceUpToDate] Could not parse extension reference '${rawRef}':`, err);
@@ -241,6 +249,16 @@ async function ensureInstanceUpToDate(projectId, instance, options) {
241
249
  if (!latestVersion || currentVersion === latestVersion) {
242
250
  return instance;
243
251
  }
252
+ const shouldUpgrade = await (0, prompt_1.confirm)({
253
+ message: `Extension instance ${clc.bold(instanceId)} is on version ${clc.bold(currentVersion)}, but the latest version is ${clc.bold(latestVersion)}. An upgrade is strongly recommended before migrating to avoid breaking changes. Upgrade it now?`,
254
+ default: true,
255
+ nonInteractive: options?.nonInteractive,
256
+ force: options?.force,
257
+ });
258
+ if (!shouldUpgrade) {
259
+ (0, utils_1.logLabeledWarning)(extensionsHelper_1.logPrefix, `Continuing migration with extension instance ${clc.bold(instanceId)} on outdated version ${clc.bold(currentVersion)}.`);
260
+ return instance;
261
+ }
244
262
  (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Upgrading extension instance ${clc.bold(instanceId)} from version ${clc.bold(currentVersion)} to ${clc.bold(latestVersion)} to ensure a smooth migration...`);
245
263
  const targetRef = `${baseRef}@${latestVersion}`;
246
264
  let finalParams = {
@@ -286,5 +304,56 @@ async function ensureInstanceUpToDate(projectId, instance, options) {
286
304
  throw new error_1.FirebaseError(`Failed to automatically upgrade extension instance ${instanceId} to version ${latestVersion}: ${message}. Please upgrade your extension instance manually using 'firebase ext:update ${instanceId}' before attempting migration.`, { original: err instanceof Error ? err : undefined });
287
305
  }
288
306
  const updatedInstance = await extensionsApi.getInstance(projectId, instanceId);
289
- return updatedInstance ?? instance;
307
+ return updatedInstance ? await (0, extensionsHelper_1.ensureInstanceSpec)(updatedInstance) : instance;
308
+ }
309
+ async function migrateSecrets(instance, options) {
310
+ const secrets = await (0, export_1.secretsNeedingEjection)(instance);
311
+ if (secrets.length === 0) {
312
+ return [];
313
+ }
314
+ const instanceId = getInstanceId(instance);
315
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Transferring secrets for instance ${clc.bold(instanceId)} to Functions management...`);
316
+ const results = await (0, export_1.ejectSecretsFromInstance)(instance);
317
+ if (results.success.length > 0) {
318
+ (0, utils_1.logLabeledSuccess)(extensionsHelper_1.logPrefix, `Successfully transferred secrets to Functions management: ${results.success.join(", ")}`);
319
+ }
320
+ if (results.fail.length > 0) {
321
+ const resultMsg = `${results.fail.length} secrets failed to update: ${results.fail.join(", ")}.`;
322
+ (0, utils_1.logLabeledError)("functions", resultMsg);
323
+ (0, utils_1.logLabeledError)("functions", "Ensure you have Secret Manager Admin (roles/secretmanager.admin) permissions to transfer secrets.");
324
+ if (!options?.force) {
325
+ throw new error_1.FirebaseError("Secret migration failed.", { exit: 1 });
326
+ }
327
+ (0, utils_1.logLabeledWarning)("functions", "Proceeding after secret migration failure in --force mode. Manually remove the 'firebase-extensions-managed' label from the secrets before running ext:uninstall, or risk permanent data loss.");
328
+ }
329
+ return results.success;
330
+ }
331
+ async function uninstallExtension(projectId, instanceId, options, skipConfirm = false) {
332
+ if (!skipConfirm &&
333
+ !(await (0, prompt_1.confirm)({
334
+ message: `About to delete Extensions instance ${projectId}/${instanceId}, its associated resources, and service account. Continue?`,
335
+ nonInteractive: options.nonInteractive,
336
+ force: options.force,
337
+ default: true,
338
+ }))) {
339
+ return;
340
+ }
341
+ let config;
342
+ try {
343
+ config = manifest.loadConfig(options);
344
+ }
345
+ catch {
346
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, "No firebase.json found. Proceeding to immediate extension instance teardown.");
347
+ }
348
+ if (config && manifest.instanceExists(instanceId, config)) {
349
+ manifest.removeFromManifest(instanceId, config);
350
+ }
351
+ (0, utils_1.logLabeledBullet)(extensionsHelper_1.logPrefix, `Uninstalling extension instance ${clc.bold(instanceId)}...`);
352
+ try {
353
+ await extensionsApi.deleteInstance(projectId, instanceId);
354
+ }
355
+ catch (err) {
356
+ throw new error_1.FirebaseError(`Error when attempting deletion: ${err instanceof Error ? err.message : String(err)}`, { original: err instanceof Error ? err : undefined });
357
+ }
358
+ (0, utils_1.logLabeledSuccess)(extensionsHelper_1.logPrefix, `Deleted Extensions instance ${projectId}/${instanceId}.`);
290
359
  }
@@ -127,12 +127,29 @@ function validateKey(key) {
127
127
  if (keyConflictsWithReservedPrefixes(key)) {
128
128
  throw new KeyValidationError(key, `Key ${key} starts with a reserved prefix (${RESERVED_PREFIXES.join(" ")})`);
129
129
  }
130
- if (RESERVED_PREFIX_ALLOWLIST.some((prefix) => key === prefix)) {
131
- throw new KeyValidationError(key, `Key ${key} is a known prefix with an empty suffix`);
132
- }
133
130
  }
134
131
  function keyConflictsWithReservedPrefixes(key) {
135
- return RESERVED_PREFIXES.some((prefix) => key.startsWith(prefix) && !RESERVED_PREFIX_ALLOWLIST.some((known) => key.startsWith(known)));
132
+ if (!RESERVED_PREFIXES.some((prefix) => key.startsWith(prefix))) {
133
+ return false;
134
+ }
135
+ for (const allowedPrefix of RESERVED_PREFIX_ALLOWLIST) {
136
+ if (keyPermittedByKnownPrefix(key, allowedPrefix)) {
137
+ return false;
138
+ }
139
+ }
140
+ return true;
141
+ }
142
+ function keyPermittedByKnownPrefix(key, prefix) {
143
+ if (!key.startsWith(prefix)) {
144
+ return false;
145
+ }
146
+ if (prefix.endsWith("_") && key === prefix) {
147
+ throw new KeyValidationError(key, `Key ${key} is a known prefix that requires a suffix`);
148
+ }
149
+ if (!prefix.endsWith("_") && key !== prefix) {
150
+ throw new KeyValidationError(key, `Key ${key} conflicts with known key ${prefix} that does not permit a suffix`);
151
+ }
152
+ return true;
136
153
  }
137
154
  function parseStrict(data) {
138
155
  const { envs, errors } = parse(data);