firebase-tools 13.5.2 → 13.6.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/accountExporter.js +1 -1
- package/lib/accountImporter.js +1 -1
- package/lib/api.js +112 -58
- package/lib/apiv2.js +3 -1
- package/lib/appdistribution/client.js +4 -4
- package/lib/auth.js +17 -17
- package/lib/commands/hosting-disable.js +1 -1
- package/lib/commands/open.js +1 -1
- package/lib/database/metadata.js +3 -3
- package/lib/defaultCredentials.js +2 -2
- package/lib/deploy/extensions/v2FunctionHelper.js +1 -1
- package/lib/deploy/functions/build.js +1 -1
- package/lib/deploy/functions/containerCleaner.js +4 -4
- package/lib/deploy/functions/deploy.js +8 -2
- package/lib/deploy/functions/ensure.js +1 -1
- package/lib/deploy/functions/prepare.js +4 -4
- package/lib/deploy/functions/release/fabricator.js +3 -3
- package/lib/deploy/functions/runtimes/discovery/index.js +2 -2
- package/lib/deploy/functions/runtimes/node/parseTriggers.js +2 -2
- package/lib/deploy/hosting/uploader.js +1 -1
- package/lib/deploy/index.js +1 -1
- package/lib/deploy/remoteconfig/functions.js +1 -1
- package/lib/emulator/adminSdkConfig.js +1 -1
- package/lib/emulator/downloadableEmulators.js +6 -6
- package/lib/ensureApiEnabled.js +1 -1
- package/lib/extensions/extensionsApi.js +5 -5
- package/lib/extensions/extensionsHelper.js +4 -4
- package/lib/extensions/provisioningHelper.js +2 -2
- package/lib/extensions/publishHelpers.js +1 -1
- package/lib/extensions/publisherApi.js +3 -3
- package/lib/extensions/resolveSource.js +1 -1
- package/lib/extensions/secretsUtils.js +1 -1
- package/lib/extensions/tos.js +1 -1
- package/lib/fetchMOTD.js +1 -1
- package/lib/fetchWebSetup.js +2 -2
- package/lib/firestore/api-sort.js +17 -0
- package/lib/firestore/api.js +9 -2
- package/lib/firestore/checkDatabaseType.js +1 -1
- package/lib/firestore/delete.js +1 -1
- package/lib/firestore/pretty-print.js +11 -2
- package/lib/functions/secrets.js +3 -3
- package/lib/functionsConfig.js +1 -1
- package/lib/gcp/apphosting.js +2 -2
- package/lib/gcp/artifactregistry.js +1 -1
- package/lib/gcp/auth.js +1 -1
- package/lib/gcp/cloudbilling.js +1 -1
- package/lib/gcp/cloudbuild.js +1 -1
- package/lib/gcp/cloudfunctions.js +1 -1
- package/lib/gcp/cloudfunctionsv2.js +1 -1
- package/lib/gcp/cloudlogging.js +1 -1
- package/lib/gcp/cloudmonitoring.js +1 -1
- package/lib/gcp/cloudscheduler.js +1 -1
- package/lib/gcp/cloudtasks.js +1 -1
- package/lib/gcp/devConnect.js +25 -15
- package/lib/gcp/eventarc.js +1 -1
- package/lib/gcp/firestore.js +2 -2
- package/lib/gcp/iam.js +2 -2
- package/lib/gcp/identityPlatform.js +1 -1
- package/lib/gcp/pubsub.js +1 -1
- package/lib/gcp/resourceManager.js +2 -1
- package/lib/gcp/rules.js +1 -1
- package/lib/gcp/run.js +1 -1
- package/lib/gcp/runtimeconfig.js +1 -1
- package/lib/gcp/secretManager.js +1 -1
- package/lib/gcp/serviceusage.js +1 -1
- package/lib/gcp/storage.js +12 -8
- package/lib/hosting/api.js +2 -2
- package/lib/hosting/cloudRunProxy.js +1 -1
- package/lib/init/features/apphosting/index.js +5 -5
- package/lib/init/features/apphosting/repo.js +16 -4
- package/lib/init/features/database.js +1 -1
- package/lib/init/features/extensions/index.js +1 -1
- package/lib/init/features/functions/index.js +2 -2
- package/lib/init/features/hosting/github.js +4 -3
- package/lib/management/apps.js +4 -4
- package/lib/management/database.js +1 -1
- package/lib/management/projects.js +4 -4
- package/lib/remoteconfig/get.js +1 -1
- package/lib/remoteconfig/rollback.js +1 -1
- package/lib/remoteconfig/versionslist.js +1 -1
- package/lib/shortenUrl.js +2 -2
- package/lib/utils.js +1 -1
- package/package.json +1 -1
package/lib/gcp/iam.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRol
|
|
|
4
4
|
const api_1 = require("../api");
|
|
5
5
|
const logger_1 = require("../logger");
|
|
6
6
|
const apiv2_1 = require("../apiv2");
|
|
7
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.iamOrigin, apiVersion: "v1" });
|
|
7
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.iamOrigin)(), apiVersion: "v1" });
|
|
8
8
|
async function createServiceAccount(projectId, accountId, description, displayName) {
|
|
9
9
|
const response = await apiClient.post(`/projects/${projectId}/serviceAccounts`, {
|
|
10
10
|
accountId,
|
|
@@ -71,6 +71,6 @@ async function testResourceIamPermissions(origin, apiVersion, resourceName, perm
|
|
|
71
71
|
}
|
|
72
72
|
exports.testResourceIamPermissions = testResourceIamPermissions;
|
|
73
73
|
async function testIamPermissions(projectId, permissions) {
|
|
74
|
-
return testResourceIamPermissions(api_1.resourceManagerOrigin, "v1", `projects/${projectId}`, permissions, `projects/${projectId}`);
|
|
74
|
+
return testResourceIamPermissions((0, api_1.resourceManagerOrigin)(), "v1", `projects/${projectId}`, permissions, `projects/${projectId}`);
|
|
75
75
|
}
|
|
76
76
|
exports.testIamPermissions = testIamPermissions;
|
|
@@ -6,7 +6,7 @@ const api_1 = require("../api");
|
|
|
6
6
|
const apiv2_1 = require("../apiv2");
|
|
7
7
|
const API_VERSION = "v2";
|
|
8
8
|
const adminApiClient = new apiv2_1.Client({
|
|
9
|
-
urlPrefix: api_1.identityOrigin + "/admin",
|
|
9
|
+
urlPrefix: (0, api_1.identityOrigin)() + "/admin",
|
|
10
10
|
apiVersion: API_VERSION,
|
|
11
11
|
});
|
|
12
12
|
async function getBlockingFunctionsConfig(project) {
|
package/lib/gcp/pubsub.js
CHANGED
|
@@ -6,13 +6,14 @@ const api_1 = require("../api");
|
|
|
6
6
|
const apiv2_1 = require("../apiv2");
|
|
7
7
|
const iam_1 = require("./iam");
|
|
8
8
|
const API_VERSION = "v1";
|
|
9
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.resourceManagerOrigin, apiVersion: API_VERSION });
|
|
9
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.resourceManagerOrigin)(), apiVersion: API_VERSION });
|
|
10
10
|
exports.firebaseRoles = {
|
|
11
11
|
apiKeysViewer: "roles/serviceusage.apiKeysViewer",
|
|
12
12
|
authAdmin: "roles/firebaseauth.admin",
|
|
13
13
|
functionsDeveloper: "roles/cloudfunctions.developer",
|
|
14
14
|
hostingAdmin: "roles/firebasehosting.admin",
|
|
15
15
|
runViewer: "roles/run.viewer",
|
|
16
|
+
serviceUsageConsumer: "roles/serviceusage.serviceUsageConsumer",
|
|
16
17
|
};
|
|
17
18
|
async function getIamPolicy(projectIdOrNumber) {
|
|
18
19
|
const response = await apiClient.post(`/projects/${projectIdOrNumber}:getIamPolicy`);
|
package/lib/gcp/rules.js
CHANGED
|
@@ -6,7 +6,7 @@ const apiv2_1 = require("../apiv2");
|
|
|
6
6
|
const logger_1 = require("../logger");
|
|
7
7
|
const utils = require("../utils");
|
|
8
8
|
const API_VERSION = "v1";
|
|
9
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.rulesOrigin, apiVersion: API_VERSION });
|
|
9
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.rulesOrigin)(), apiVersion: API_VERSION });
|
|
10
10
|
function _handleErrorResponse(response) {
|
|
11
11
|
if (response.body && response.body.error) {
|
|
12
12
|
return utils.reject(response.body.error, { code: 2 });
|
package/lib/gcp/run.js
CHANGED
|
@@ -9,7 +9,7 @@ const throttler_1 = require("../throttler/throttler");
|
|
|
9
9
|
const logger_1 = require("../logger");
|
|
10
10
|
const API_VERSION = "v1";
|
|
11
11
|
const client = new apiv2_1.Client({
|
|
12
|
-
urlPrefix: api_1.runOrigin,
|
|
12
|
+
urlPrefix: (0, api_1.runOrigin)(),
|
|
13
13
|
auth: true,
|
|
14
14
|
apiVersion: API_VERSION,
|
|
15
15
|
});
|
package/lib/gcp/runtimeconfig.js
CHANGED
|
@@ -6,7 +6,7 @@ const api_1 = require("../api");
|
|
|
6
6
|
const apiv2_1 = require("../apiv2");
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
8
|
const API_VERSION = "v1beta1";
|
|
9
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.runtimeconfigOrigin, apiVersion: API_VERSION });
|
|
9
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.runtimeconfigOrigin)(), apiVersion: API_VERSION });
|
|
10
10
|
function listConfigs(projectId) {
|
|
11
11
|
return apiClient
|
|
12
12
|
.get(`/projects/${projectId}/configs`, {
|
package/lib/gcp/secretManager.js
CHANGED
|
@@ -13,7 +13,7 @@ const SECRET_VERSION_NAME_REGEX = new RegExp(SECRET_NAME_REGEX.source + "\\/vers
|
|
|
13
13
|
const secretManagerConsoleUri = (projectId) => `https://console.cloud.google.com/security/secret-manager?project=${projectId}`;
|
|
14
14
|
exports.secretManagerConsoleUri = secretManagerConsoleUri;
|
|
15
15
|
const API_VERSION = "v1";
|
|
16
|
-
const client = new apiv2_1.Client({ urlPrefix: api_1.secretManagerOrigin, apiVersion: API_VERSION });
|
|
16
|
+
const client = new apiv2_1.Client({ urlPrefix: (0, api_1.secretManagerOrigin)(), apiVersion: API_VERSION });
|
|
17
17
|
async function getSecret(projectId, name) {
|
|
18
18
|
var _a;
|
|
19
19
|
const getRes = await client.get(`projects/${projectId}/secrets/${name}`);
|
package/lib/gcp/serviceusage.js
CHANGED
|
@@ -7,7 +7,7 @@ const apiv2_1 = require("../apiv2");
|
|
|
7
7
|
const error_1 = require("../error");
|
|
8
8
|
const utils = require("../utils");
|
|
9
9
|
const apiClient = new apiv2_1.Client({
|
|
10
|
-
urlPrefix: api_1.serviceUsageOrigin,
|
|
10
|
+
urlPrefix: (0, api_1.serviceUsageOrigin)(),
|
|
11
11
|
apiVersion: "v1beta1",
|
|
12
12
|
});
|
|
13
13
|
async function generateServiceIdentity(projectNumber, service, prefix) {
|
package/lib/gcp/storage.js
CHANGED
|
@@ -10,9 +10,12 @@ const logger_1 = require("../logger");
|
|
|
10
10
|
const ensureApiEnabled_1 = require("../ensureApiEnabled");
|
|
11
11
|
async function getDefaultBucket(projectId) {
|
|
12
12
|
var _a;
|
|
13
|
-
await (0, ensureApiEnabled_1.ensure)(projectId, api_1.firebaseStorageOrigin, "storage", false);
|
|
13
|
+
await (0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.firebaseStorageOrigin)(), "storage", false);
|
|
14
14
|
try {
|
|
15
|
-
const localAPIClient = new apiv2_1.Client({
|
|
15
|
+
const localAPIClient = new apiv2_1.Client({
|
|
16
|
+
urlPrefix: (0, api_1.firebaseStorageOrigin)(),
|
|
17
|
+
apiVersion: "v1alpha",
|
|
18
|
+
});
|
|
16
19
|
const response = await localAPIClient.get(`/projects/${projectId}/defaultBucket`);
|
|
17
20
|
if (!((_a = response.body) === null || _a === void 0 ? void 0 : _a.bucket.name)) {
|
|
18
21
|
logger_1.logger.debug("Default storage bucket is undefined.");
|
|
@@ -29,7 +32,7 @@ async function getDefaultBucket(projectId) {
|
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
exports.getDefaultBucket = getDefaultBucket;
|
|
32
|
-
async function upload(source, uploadUrl, extraHeaders) {
|
|
35
|
+
async function upload(source, uploadUrl, extraHeaders, ignoreQuotaProject) {
|
|
33
36
|
const url = new URL(uploadUrl);
|
|
34
37
|
const localAPIClient = new apiv2_1.Client({ urlPrefix: url.origin, auth: false });
|
|
35
38
|
const res = await localAPIClient.request({
|
|
@@ -40,6 +43,7 @@ async function upload(source, uploadUrl, extraHeaders) {
|
|
|
40
43
|
headers: Object.assign({ "content-type": "application/zip" }, extraHeaders),
|
|
41
44
|
body: source.stream,
|
|
42
45
|
skipLog: { resBody: true },
|
|
46
|
+
ignoreQuotaProject,
|
|
43
47
|
});
|
|
44
48
|
return {
|
|
45
49
|
generation: res.response.headers.get("x-goog-generation"),
|
|
@@ -50,7 +54,7 @@ async function uploadObject(source, bucketName) {
|
|
|
50
54
|
if (path.extname(source.file) !== ".zip") {
|
|
51
55
|
throw new error_1.FirebaseError(`Expected a file name ending in .zip, got ${source.file}`);
|
|
52
56
|
}
|
|
53
|
-
const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
|
|
57
|
+
const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
|
|
54
58
|
const location = `/${bucketName}/${path.basename(source.file)}`;
|
|
55
59
|
const res = await localAPIClient.request({
|
|
56
60
|
method: "PUT",
|
|
@@ -69,13 +73,13 @@ async function uploadObject(source, bucketName) {
|
|
|
69
73
|
}
|
|
70
74
|
exports.uploadObject = uploadObject;
|
|
71
75
|
function deleteObject(location) {
|
|
72
|
-
const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
|
|
76
|
+
const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
|
|
73
77
|
return localAPIClient.delete(location);
|
|
74
78
|
}
|
|
75
79
|
exports.deleteObject = deleteObject;
|
|
76
80
|
async function getBucket(bucketName) {
|
|
77
81
|
try {
|
|
78
|
-
const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
|
|
82
|
+
const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
|
|
79
83
|
const result = await localAPIClient.get(`/storage/v1/b/${bucketName}`);
|
|
80
84
|
return result.body;
|
|
81
85
|
}
|
|
@@ -89,7 +93,7 @@ async function getBucket(bucketName) {
|
|
|
89
93
|
exports.getBucket = getBucket;
|
|
90
94
|
async function listBuckets(projectId) {
|
|
91
95
|
try {
|
|
92
|
-
const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
|
|
96
|
+
const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
|
|
93
97
|
const result = await localAPIClient.get(`/storage/v1/b?project=${projectId}`);
|
|
94
98
|
return result.body.items.map((bucket) => bucket.name);
|
|
95
99
|
}
|
|
@@ -103,7 +107,7 @@ async function listBuckets(projectId) {
|
|
|
103
107
|
exports.listBuckets = listBuckets;
|
|
104
108
|
async function getServiceAccount(projectId) {
|
|
105
109
|
try {
|
|
106
|
-
const localAPIClient = new apiv2_1.Client({ urlPrefix: api_1.storageOrigin });
|
|
110
|
+
const localAPIClient = new apiv2_1.Client({ urlPrefix: (0, api_1.storageOrigin)() });
|
|
107
111
|
const response = await localAPIClient.get(`/storage/v1/projects/${projectId}/serviceAccount`);
|
|
108
112
|
return response.body;
|
|
109
113
|
}
|
package/lib/hosting/api.js
CHANGED
|
@@ -28,7 +28,7 @@ function normalizeName(s) {
|
|
|
28
28
|
}
|
|
29
29
|
exports.normalizeName = normalizeName;
|
|
30
30
|
const apiClient = new apiv2_1.Client({
|
|
31
|
-
urlPrefix: api_1.hostingApiOrigin,
|
|
31
|
+
urlPrefix: (0, api_1.hostingApiOrigin)(),
|
|
32
32
|
apiVersion: "v1beta1",
|
|
33
33
|
auth: true,
|
|
34
34
|
});
|
|
@@ -122,7 +122,7 @@ async function cloneVersion(site, versionName, finalize = false) {
|
|
|
122
122
|
});
|
|
123
123
|
const { name: operationName } = res.body;
|
|
124
124
|
const pollRes = await operationPoller.pollOperation({
|
|
125
|
-
apiOrigin: api_1.hostingApiOrigin,
|
|
125
|
+
apiOrigin: (0, api_1.hostingApiOrigin)(),
|
|
126
126
|
apiVersion: "v1beta1",
|
|
127
127
|
operationResourceName: operationName,
|
|
128
128
|
masterTimeout: 600000,
|
|
@@ -7,7 +7,7 @@ const error_1 = require("../error");
|
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
8
|
const projectUtils_1 = require("../projectUtils");
|
|
9
9
|
const cloudRunCache = {};
|
|
10
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudRunApiOrigin, apiVersion: "v1" });
|
|
10
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.cloudRunApiOrigin)(), apiVersion: "v1" });
|
|
11
11
|
async function getCloudRunUrl(rewrite, projectId) {
|
|
12
12
|
var _a;
|
|
13
13
|
const alreadyFetched = cloudRunCache[`${rewrite.run.region}/${rewrite.run.serviceId}`];
|
|
@@ -17,17 +17,17 @@ const ensureApiEnabled_1 = require("../../../ensureApiEnabled");
|
|
|
17
17
|
const deploymentTool = require("../../../deploymentTool");
|
|
18
18
|
const DEFAULT_COMPUTE_SERVICE_ACCOUNT_NAME = "firebase-app-hosting-compute";
|
|
19
19
|
const apphostingPollerOptions = {
|
|
20
|
-
apiOrigin: api_1.apphostingOrigin,
|
|
20
|
+
apiOrigin: (0, api_1.apphostingOrigin)(),
|
|
21
21
|
apiVersion: apphosting_1.API_VERSION,
|
|
22
22
|
masterTimeout: 25 * 60 * 1000,
|
|
23
23
|
maxBackoff: 10000,
|
|
24
24
|
};
|
|
25
25
|
async function doSetup(projectId, location, serviceAccount) {
|
|
26
26
|
await Promise.all([
|
|
27
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.cloudbuildOrigin, "apphosting", true),
|
|
28
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.secretManagerOrigin, "apphosting", true),
|
|
29
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.cloudRunApiOrigin, "apphosting", true),
|
|
30
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.artifactRegistryDomain, "apphosting", true),
|
|
27
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudbuildOrigin)(), "apphosting", true),
|
|
28
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.secretManagerOrigin)(), "apphosting", true),
|
|
29
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.cloudRunApiOrigin)(), "apphosting", true),
|
|
30
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.artifactRegistryDomain)(), "apphosting", true),
|
|
31
31
|
]);
|
|
32
32
|
const allowedLocations = (await apphosting.listLocations(projectId)).map((loc) => loc.locationId);
|
|
33
33
|
if (location) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.linkGitHubRepository = exports.parseConnectionName = void 0;
|
|
3
|
+
exports.fetchAllRepositories = exports.listAppHostingConnections = exports.getOrCreateRepository = exports.getOrCreateConnection = exports.createConnection = exports.getOrCreateOauthConnection = exports.linkGitHubRepository = exports.parseConnectionName = void 0;
|
|
4
4
|
const clc = require("colorette");
|
|
5
5
|
const gcb = require("../../../gcp/cloudbuild");
|
|
6
6
|
const rm = require("../../../gcp/resourceManager");
|
|
@@ -29,7 +29,7 @@ function parseConnectionName(name) {
|
|
|
29
29
|
}
|
|
30
30
|
exports.parseConnectionName = parseConnectionName;
|
|
31
31
|
const gcbPollerOptions = {
|
|
32
|
-
apiOrigin: api_1.cloudbuildOrigin,
|
|
32
|
+
apiOrigin: (0, api_1.cloudbuildOrigin)(),
|
|
33
33
|
apiVersion: "v2",
|
|
34
34
|
masterTimeout: 25 * 60 * 1000,
|
|
35
35
|
maxBackoff: 10000,
|
|
@@ -56,7 +56,6 @@ async function linkGitHubRepository(projectId, location) {
|
|
|
56
56
|
const oauthConn = await getOrCreateOauthConnection(projectId, location);
|
|
57
57
|
const existingConns = await listAppHostingConnections(projectId);
|
|
58
58
|
if (existingConns.length === 0) {
|
|
59
|
-
await ensureSecretManagerAdminGrant(projectId);
|
|
60
59
|
existingConns.push(await createFullyInstalledConnection(projectId, location, generateConnectionId(), oauthConn));
|
|
61
60
|
}
|
|
62
61
|
let repoRemoteUri;
|
|
@@ -99,7 +98,19 @@ async function createFullyInstalledConnection(projectId, location, connectionId,
|
|
|
99
98
|
return conn;
|
|
100
99
|
}
|
|
101
100
|
async function getOrCreateOauthConnection(projectId, location) {
|
|
102
|
-
let conn
|
|
101
|
+
let conn;
|
|
102
|
+
try {
|
|
103
|
+
conn = await gcb.getConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
|
|
104
|
+
}
|
|
105
|
+
catch (err) {
|
|
106
|
+
if (err.status === 404) {
|
|
107
|
+
await ensureSecretManagerAdminGrant(projectId);
|
|
108
|
+
conn = await createConnection(projectId, location, APPHOSTING_OAUTH_CONN_NAME);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
throw err;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
103
114
|
while (conn.installationState.stage === "PENDING_USER_OAUTH") {
|
|
104
115
|
utils.logBullet("You must authorize the Cloud Build GitHub app.");
|
|
105
116
|
utils.logBullet("Sign in to GitHub and authorize Cloud Build GitHub app:");
|
|
@@ -115,6 +126,7 @@ async function getOrCreateOauthConnection(projectId, location) {
|
|
|
115
126
|
}
|
|
116
127
|
return conn;
|
|
117
128
|
}
|
|
129
|
+
exports.getOrCreateOauthConnection = getOrCreateOauthConnection;
|
|
118
130
|
async function promptRepositoryUri(projectId, connections) {
|
|
119
131
|
const { repos, remoteUriToConnection } = await fetchAllRepositories(projectId, connections);
|
|
120
132
|
const remoteUri = await (0, prompt_1.promptOnce)({
|
|
@@ -71,7 +71,7 @@ async function doSetup(setup, config) {
|
|
|
71
71
|
setup.config = setup.config || {};
|
|
72
72
|
let instanceDetails;
|
|
73
73
|
if (setup.projectId) {
|
|
74
|
-
await (0, ensureApiEnabled_1.ensure)(setup.projectId, api_1.rtdbManagementOrigin, "database", false);
|
|
74
|
+
await (0, ensureApiEnabled_1.ensure)(setup.projectId, (0, api_1.rtdbManagementOrigin)(), "database", false);
|
|
75
75
|
logger_1.logger.info();
|
|
76
76
|
setup.instance =
|
|
77
77
|
setup.instance || (await (0, getDefaultDatabaseInstance_1.getDefaultDatabaseInstance)({ project: setup.projectId }));
|
|
@@ -10,7 +10,7 @@ async function doSetup(setup, config, options) {
|
|
|
10
10
|
const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
|
|
11
11
|
if (projectId) {
|
|
12
12
|
await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: projectId }));
|
|
13
|
-
await Promise.all([(0, ensureApiEnabled_1.ensure)(projectId, api_1.extensionsOrigin, "unused", true)]);
|
|
13
|
+
await Promise.all([(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.extensionsOrigin)(), "unused", true)]);
|
|
14
14
|
}
|
|
15
15
|
return manifest.writeEmptyManifest(config, options);
|
|
16
16
|
}
|
|
@@ -16,8 +16,8 @@ async function doSetup(setup, config, options) {
|
|
|
16
16
|
if (projectId) {
|
|
17
17
|
await (0, requirePermissions_1.requirePermissions)(Object.assign(Object.assign({}, options), { project: projectId }));
|
|
18
18
|
await Promise.all([
|
|
19
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.functionsOrigin, "unused", true),
|
|
20
|
-
(0, ensureApiEnabled_1.ensure)(projectId, api_1.runtimeconfigOrigin, "unused", true),
|
|
19
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.functionsOrigin)(), "unused", true),
|
|
20
|
+
(0, ensureApiEnabled_1.ensure)(projectId, (0, api_1.runtimeconfigOrigin)(), "unused", true),
|
|
21
21
|
]);
|
|
22
22
|
}
|
|
23
23
|
setup.functions = {};
|
|
@@ -28,7 +28,7 @@ const YML_MERGE_FILENAME = "firebase-hosting-merge.yml";
|
|
|
28
28
|
const CHECKOUT_GITHUB_ACTION_NAME = "actions/checkout@v4";
|
|
29
29
|
const HOSTING_GITHUB_ACTION_NAME = "FirebaseExtended/action-hosting-deploy@v0";
|
|
30
30
|
const SERVICE_ACCOUNT_MAX_KEY_NUMBER = 10;
|
|
31
|
-
const githubApiClient = new apiv2_1.Client({ urlPrefix: api_1.githubApiOrigin, auth: false });
|
|
31
|
+
const githubApiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.githubApiOrigin)(), auth: false });
|
|
32
32
|
async function initGitHub(setup) {
|
|
33
33
|
if (!setup.projectId) {
|
|
34
34
|
return (0, utils_1.reject)("Could not determine Project ID, can't set up GitHub workflow.", { exit: 1 });
|
|
@@ -109,7 +109,7 @@ async function initGitHub(setup) {
|
|
|
109
109
|
}
|
|
110
110
|
logger_1.logger.info();
|
|
111
111
|
(0, utils_1.logLabeledBullet)("Action required", `Visit this URL to revoke authorization for the Firebase CLI GitHub OAuth App:`);
|
|
112
|
-
logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${api_1.githubClientId}`)));
|
|
112
|
+
logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${(0, api_1.githubClientId)()}`)));
|
|
113
113
|
(0, utils_1.logLabeledBullet)("Action required", `Push any new workflow file(s) to your repo`);
|
|
114
114
|
}
|
|
115
115
|
exports.initGitHub = initGitHub;
|
|
@@ -260,7 +260,7 @@ async function promptForRepo(options, ghAccessToken) {
|
|
|
260
260
|
(0, utils_1.logWarning)("The provided authorization cannot be used with this repository. If this repository is in an organization, did you remember to grant access?", "error");
|
|
261
261
|
logger_1.logger.info();
|
|
262
262
|
(0, utils_1.logLabeledBullet)("Action required", `Visit this URL to ensure access has been granted to the appropriate organization(s) for the Firebase CLI GitHub OAuth App:`);
|
|
263
|
-
logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${api_1.githubClientId}`)));
|
|
263
|
+
logger_1.logger.info((0, colorette_1.bold)((0, colorette_1.underline)(`https://github.com/settings/connections/applications/${(0, api_1.githubClientId)()}`)));
|
|
264
264
|
logger_1.logger.info();
|
|
265
265
|
}
|
|
266
266
|
return false;
|
|
@@ -378,6 +378,7 @@ async function createServiceAccountAndKey(options, repo, accountId) {
|
|
|
378
378
|
}
|
|
379
379
|
const requiredRoles = [
|
|
380
380
|
resourceManager_1.firebaseRoles.authAdmin,
|
|
381
|
+
resourceManager_1.firebaseRoles.serviceUsageConsumer,
|
|
381
382
|
resourceManager_1.firebaseRoles.apiKeysViewer,
|
|
382
383
|
resourceManager_1.firebaseRoles.hostingAdmin,
|
|
383
384
|
resourceManager_1.firebaseRoles.runViewer,
|
package/lib/management/apps.js
CHANGED
|
@@ -40,7 +40,7 @@ function getAppPlatform(platform) {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
exports.getAppPlatform = getAppPlatform;
|
|
43
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseApiOrigin, apiVersion: "v1beta1" });
|
|
43
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.firebaseApiOrigin)(), apiVersion: "v1beta1" });
|
|
44
44
|
async function createIosApp(projectId, options) {
|
|
45
45
|
try {
|
|
46
46
|
const response = await apiClient.request({
|
|
@@ -51,7 +51,7 @@ async function createIosApp(projectId, options) {
|
|
|
51
51
|
});
|
|
52
52
|
const appData = await (0, operation_poller_1.pollOperation)({
|
|
53
53
|
pollerName: "Create iOS app Poller",
|
|
54
|
-
apiOrigin: api_1.firebaseApiOrigin,
|
|
54
|
+
apiOrigin: (0, api_1.firebaseApiOrigin)(),
|
|
55
55
|
apiVersion: "v1beta1",
|
|
56
56
|
operationResourceName: response.body.name,
|
|
57
57
|
});
|
|
@@ -73,7 +73,7 @@ async function createAndroidApp(projectId, options) {
|
|
|
73
73
|
});
|
|
74
74
|
const appData = await (0, operation_poller_1.pollOperation)({
|
|
75
75
|
pollerName: "Create Android app Poller",
|
|
76
|
-
apiOrigin: api_1.firebaseApiOrigin,
|
|
76
|
+
apiOrigin: (0, api_1.firebaseApiOrigin)(),
|
|
77
77
|
apiVersion: "v1beta1",
|
|
78
78
|
operationResourceName: response.body.name,
|
|
79
79
|
});
|
|
@@ -98,7 +98,7 @@ async function createWebApp(projectId, options) {
|
|
|
98
98
|
});
|
|
99
99
|
const appData = await (0, operation_poller_1.pollOperation)({
|
|
100
100
|
pollerName: "Create Web app Poller",
|
|
101
|
-
apiOrigin: api_1.firebaseApiOrigin,
|
|
101
|
+
apiOrigin: (0, api_1.firebaseApiOrigin)(),
|
|
102
102
|
apiVersion: "v1beta1",
|
|
103
103
|
operationResourceName: response.body.name,
|
|
104
104
|
});
|
|
@@ -31,7 +31,7 @@ var DatabaseLocation;
|
|
|
31
31
|
DatabaseLocation["ASIA_SOUTHEAST1"] = "asia-southeast1";
|
|
32
32
|
DatabaseLocation["ANY"] = "-";
|
|
33
33
|
})(DatabaseLocation = exports.DatabaseLocation || (exports.DatabaseLocation = {}));
|
|
34
|
-
const apiClient = new apiv2_1.Client({ urlPrefix: api_1.rtdbManagementOrigin, apiVersion: exports.MGMT_API_VERSION });
|
|
34
|
+
const apiClient = new apiv2_1.Client({ urlPrefix: (0, api_1.rtdbManagementOrigin)(), apiVersion: exports.MGMT_API_VERSION });
|
|
35
35
|
async function populateInstanceDetails(options) {
|
|
36
36
|
options.instanceDetails = await getDatabaseInstanceDetails(options.project, options.instance);
|
|
37
37
|
return Promise.resolve();
|
|
@@ -35,7 +35,7 @@ exports.PROJECTS_CREATE_QUESTIONS = [
|
|
|
35
35
|
},
|
|
36
36
|
];
|
|
37
37
|
const firebaseAPIClient = new apiv2_1.Client({
|
|
38
|
-
urlPrefix: api.firebaseApiOrigin,
|
|
38
|
+
urlPrefix: api.firebaseApiOrigin(),
|
|
39
39
|
auth: true,
|
|
40
40
|
apiVersion: "v1beta1",
|
|
41
41
|
});
|
|
@@ -171,7 +171,7 @@ async function promptAvailableProjectId() {
|
|
|
171
171
|
exports.promptAvailableProjectId = promptAvailableProjectId;
|
|
172
172
|
async function createCloudProject(projectId, options) {
|
|
173
173
|
try {
|
|
174
|
-
const client = new apiv2_1.Client({ urlPrefix: api.resourceManagerOrigin, apiVersion: "v1" });
|
|
174
|
+
const client = new apiv2_1.Client({ urlPrefix: api.resourceManagerOrigin(), apiVersion: "v1" });
|
|
175
175
|
const data = {
|
|
176
176
|
projectId,
|
|
177
177
|
name: options.displayName || projectId,
|
|
@@ -185,7 +185,7 @@ async function createCloudProject(projectId, options) {
|
|
|
185
185
|
});
|
|
186
186
|
const projectInfo = await (0, operation_poller_1.pollOperation)({
|
|
187
187
|
pollerName: "Project Creation Poller",
|
|
188
|
-
apiOrigin: api.resourceManagerOrigin,
|
|
188
|
+
apiOrigin: api.resourceManagerOrigin(),
|
|
189
189
|
apiVersion: "v1",
|
|
190
190
|
operationResourceName: response.body.name,
|
|
191
191
|
});
|
|
@@ -216,7 +216,7 @@ async function addFirebaseToCloudProject(projectId) {
|
|
|
216
216
|
});
|
|
217
217
|
const projectInfo = await (0, operation_poller_1.pollOperation)({
|
|
218
218
|
pollerName: "Add Firebase Poller",
|
|
219
|
-
apiOrigin: api.firebaseApiOrigin,
|
|
219
|
+
apiOrigin: api.firebaseApiOrigin(),
|
|
220
220
|
apiVersion: "v1beta1",
|
|
221
221
|
operationResourceName: response.body.name,
|
|
222
222
|
});
|
package/lib/remoteconfig/get.js
CHANGED
|
@@ -8,7 +8,7 @@ const error_1 = require("../error");
|
|
|
8
8
|
const TIMEOUT = 30000;
|
|
9
9
|
const MAX_DISPLAY_ITEMS = 50;
|
|
10
10
|
const apiClient = new apiv2_1.Client({
|
|
11
|
-
urlPrefix: api_1.remoteConfigApiOrigin,
|
|
11
|
+
urlPrefix: (0, api_1.remoteConfigApiOrigin)(),
|
|
12
12
|
apiVersion: "v1",
|
|
13
13
|
});
|
|
14
14
|
function parseTemplateForTable(templateItems) {
|
|
@@ -4,7 +4,7 @@ exports.rollbackTemplate = void 0;
|
|
|
4
4
|
const api_1 = require("../api");
|
|
5
5
|
const apiv2_1 = require("../apiv2");
|
|
6
6
|
const apiClient = new apiv2_1.Client({
|
|
7
|
-
urlPrefix: api_1.remoteConfigApiOrigin,
|
|
7
|
+
urlPrefix: (0, api_1.remoteConfigApiOrigin)(),
|
|
8
8
|
apiVersion: "v1",
|
|
9
9
|
});
|
|
10
10
|
const TIMEOUT = 30000;
|
|
@@ -6,7 +6,7 @@ const apiv2_1 = require("../apiv2");
|
|
|
6
6
|
const error_1 = require("../error");
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
8
|
const apiClient = new apiv2_1.Client({
|
|
9
|
-
urlPrefix: api_1.remoteConfigApiOrigin,
|
|
9
|
+
urlPrefix: (0, api_1.remoteConfigApiOrigin)(),
|
|
10
10
|
apiVersion: "v1",
|
|
11
11
|
});
|
|
12
12
|
const TIMEOUT = 30000;
|
package/lib/shortenUrl.js
CHANGED
|
@@ -6,13 +6,13 @@ const apiv2_1 = require("./apiv2");
|
|
|
6
6
|
const api_1 = require("./api");
|
|
7
7
|
const DYNAMIC_LINKS_PREFIX = "https://firebase.tools/l";
|
|
8
8
|
const apiClient = new apiv2_1.Client({
|
|
9
|
-
urlPrefix: api_1.dynamicLinksOrigin,
|
|
9
|
+
urlPrefix: (0, api_1.dynamicLinksOrigin)(),
|
|
10
10
|
auth: false,
|
|
11
11
|
apiVersion: "v1",
|
|
12
12
|
});
|
|
13
13
|
async function shortenUrl(url, guessable = false) {
|
|
14
14
|
try {
|
|
15
|
-
const response = await apiClient.post(`shortLinks?key=${api_1.dynamicLinksKey}`, {
|
|
15
|
+
const response = await apiClient.post(`shortLinks?key=${(0, api_1.dynamicLinksKey)()}`, {
|
|
16
16
|
dynamicLinkInfo: {
|
|
17
17
|
link: url,
|
|
18
18
|
domainUriPrefix: DYNAMIC_LINKS_PREFIX,
|
package/lib/utils.js
CHANGED
|
@@ -27,7 +27,7 @@ const THIRTY_DAYS_IN_MILLISECONDS = 30 * 24 * 60 * 60 * 1000;
|
|
|
27
27
|
exports.envOverrides = [];
|
|
28
28
|
function consoleUrl(project, path) {
|
|
29
29
|
const api = require("./api");
|
|
30
|
-
return `${api.consoleOrigin}/project/${project}${path}`;
|
|
30
|
+
return `${api.consoleOrigin()}/project/${project}${path}`;
|
|
31
31
|
}
|
|
32
32
|
exports.consoleUrl = consoleUrl;
|
|
33
33
|
function getInheritedOption(options, key) {
|