firebase-tools 14.0.0 → 14.0.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.
|
@@ -264,7 +264,6 @@ async function promptCloneUri(projectId, connection) {
|
|
|
264
264
|
return cloneUri;
|
|
265
265
|
}
|
|
266
266
|
async function promptGitHubBranch(repoLink) {
|
|
267
|
-
var _a;
|
|
268
267
|
const branches = await devConnect.listAllBranches(repoLink.name);
|
|
269
268
|
const branch = await (0, prompt_1.promptOnce)({
|
|
270
269
|
type: "autocomplete",
|
|
@@ -281,7 +280,6 @@ async function promptGitHubBranch(repoLink) {
|
|
|
281
280
|
]));
|
|
282
281
|
},
|
|
283
282
|
});
|
|
284
|
-
utils.logWarning(`The branch "${branch}" does not exist on "${(_a = extractRepoSlugFromUri(repoLink.cloneUri)) !== null && _a !== void 0 ? _a : ""}". Please enter a valid branch for this repo.`);
|
|
285
283
|
return branch;
|
|
286
284
|
}
|
|
287
285
|
exports.promptGitHubBranch = promptGitHubBranch;
|
|
@@ -104,6 +104,7 @@ Constants.FIRESTORE_EMULATOR_HOST = "FIRESTORE_EMULATOR_HOST";
|
|
|
104
104
|
Constants.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
|
|
105
105
|
Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";
|
|
106
106
|
Constants.FIREBASE_DATACONNECT_EMULATOR_HOST = "FIREBASE_DATA_CONNECT_EMULATOR_HOST";
|
|
107
|
+
Constants.FIREBASE_DATACONNECT_ENV_ALT = "DATA_CONNECT_EMULATOR_HOST";
|
|
107
108
|
Constants.FIREBASE_AUTH_EMULATOR_HOST = "FIREBASE_AUTH_EMULATOR_HOST";
|
|
108
109
|
Constants.FIREBASE_STORAGE_EMULATOR_HOST = "FIREBASE_STORAGE_EMULATOR_HOST";
|
|
109
110
|
Constants.CLOUD_STORAGE_EMULATOR_HOST = "STORAGE_EMULATOR_HOST";
|
package/lib/emulator/env.js
CHANGED
|
@@ -37,6 +37,7 @@ function setEnvVarsForEmulators(env, emulators) {
|
|
|
37
37
|
break;
|
|
38
38
|
case types_1.Emulators.DATACONNECT:
|
|
39
39
|
env[constants_1.Constants.FIREBASE_DATACONNECT_EMULATOR_HOST] = `http://${host}`;
|
|
40
|
+
env[constants_1.Constants.FIREBASE_DATACONNECT_ENV_ALT] = `http://${host}`;
|
|
40
41
|
env["FIREBASE_DATACONNECT_EMULATOR_HOST"] = host;
|
|
41
42
|
}
|
|
42
43
|
}
|
|
@@ -340,7 +340,7 @@ function functionFromEndpoint(endpoint, sourceUploadUrl) {
|
|
|
340
340
|
}
|
|
341
341
|
}
|
|
342
342
|
proto.copyIfPresent(gcfFunction, endpoint, "minInstances", "maxInstances", "ingressSettings", "environmentVariables", "secretEnvironmentVariables");
|
|
343
|
-
proto.convertIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "serviceAccount", (from) => proto.formatServiceAccount(from, endpoint.project, true));
|
|
343
|
+
proto.convertIfPresent(gcfFunction, endpoint, "serviceAccountEmail", "serviceAccount", (from) => !from ? null : proto.formatServiceAccount(from, endpoint.project, true));
|
|
344
344
|
proto.convertIfPresent(gcfFunction, endpoint, "availableMemoryMb", (mem) => mem);
|
|
345
345
|
proto.convertIfPresent(gcfFunction, endpoint, "timeout", "timeoutSeconds", (sec) => sec ? proto.durationFromSeconds(sec) : null);
|
|
346
346
|
if (endpoint.vpc) {
|
|
@@ -193,7 +193,9 @@ function functionFromEndpoint(endpoint) {
|
|
|
193
193
|
};
|
|
194
194
|
proto.copyIfPresent(gcfFunction, endpoint, "labels");
|
|
195
195
|
proto.copyIfPresent(gcfFunction.serviceConfig, endpoint, "environmentVariables", "secretEnvironmentVariables", "ingressSettings", "timeoutSeconds");
|
|
196
|
-
proto.convertIfPresent(gcfFunction.serviceConfig, endpoint, "serviceAccountEmail", "serviceAccount", (from) =>
|
|
196
|
+
proto.convertIfPresent(gcfFunction.serviceConfig, endpoint, "serviceAccountEmail", "serviceAccount", (from) => !from
|
|
197
|
+
? null
|
|
198
|
+
: proto.formatServiceAccount(from, endpoint.project, true));
|
|
197
199
|
const mem = endpoint.availableMemoryMb || backend.DEFAULT_MEMORY;
|
|
198
200
|
gcfFunction.serviceConfig.availableMemory = mem > 1024 ? `${mem / 1024}Gi` : `${mem}Mi`;
|
|
199
201
|
proto.renameIfPresent(gcfFunction.serviceConfig, endpoint, "minInstanceCount", "minInstances");
|