@strapi/cloud-cli 5.4.0 → 5.4.2
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/dist/bin.js +1 -0
- package/dist/bin.js.map +1 -1
- package/dist/index.js +294 -95
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +293 -95
- package/dist/index.mjs.map +1 -1
- package/dist/src/deploy-project/action.d.ts +2 -1
- package/dist/src/deploy-project/action.d.ts.map +1 -1
- package/dist/src/deploy-project/command.d.ts.map +1 -1
- package/dist/src/environment/link/action.d.ts +4 -0
- package/dist/src/environment/link/action.d.ts.map +1 -0
- package/dist/src/environment/link/command.d.ts +4 -0
- package/dist/src/environment/link/command.d.ts.map +1 -0
- package/dist/src/environment/link/index.d.ts +7 -0
- package/dist/src/environment/link/index.d.ts.map +1 -0
- package/dist/src/environment/list/action.d.ts.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/link/action.d.ts.map +1 -1
- package/dist/src/services/cli-api.d.ts +19 -4
- package/dist/src/services/cli-api.d.ts.map +1 -1
- package/dist/src/services/strapi-info-save.d.ts +15 -2
- package/dist/src/services/strapi-info-save.d.ts.map +1 -1
- package/dist/src/types.d.ts +3 -0
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils/get-local-config.d.ts +6 -0
- package/dist/src/utils/get-local-config.d.ts.map +1 -0
- package/package.json +6 -5
package/dist/index.js
CHANGED
|
@@ -25,6 +25,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
|
25
25
|
const crypto$1 = require("crypto");
|
|
26
26
|
const fse = require("fs-extra");
|
|
27
27
|
const inquirer = require("inquirer");
|
|
28
|
+
const boxen = require("boxen");
|
|
28
29
|
const path = require("path");
|
|
29
30
|
const chalk = require("chalk");
|
|
30
31
|
const axios = require("axios");
|
|
@@ -35,6 +36,7 @@ const minimatch = require("minimatch");
|
|
|
35
36
|
const fp = require("lodash/fp");
|
|
36
37
|
const os = require("os");
|
|
37
38
|
const XDGAppPaths = require("xdg-app-paths");
|
|
39
|
+
const lodash = require("lodash");
|
|
38
40
|
const jwksClient = require("jwks-rsa");
|
|
39
41
|
const jwt = require("jsonwebtoken");
|
|
40
42
|
const stringify = require("fast-safe-stringify");
|
|
@@ -66,6 +68,7 @@ function _interopNamespace(e) {
|
|
|
66
68
|
const crypto__default = /* @__PURE__ */ _interopDefault(crypto$1);
|
|
67
69
|
const fse__namespace = /* @__PURE__ */ _interopNamespace(fse);
|
|
68
70
|
const inquirer__default = /* @__PURE__ */ _interopDefault(inquirer);
|
|
71
|
+
const boxen__default = /* @__PURE__ */ _interopDefault(boxen);
|
|
69
72
|
const path__namespace = /* @__PURE__ */ _interopNamespace(path);
|
|
70
73
|
const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
|
|
71
74
|
const axios__default = /* @__PURE__ */ _interopDefault(axios);
|
|
@@ -177,7 +180,7 @@ async function getConfigPath() {
|
|
|
177
180
|
}
|
|
178
181
|
return configPath;
|
|
179
182
|
}
|
|
180
|
-
async function getLocalConfig() {
|
|
183
|
+
async function getLocalConfig$1() {
|
|
181
184
|
const configPath = await getConfigPath();
|
|
182
185
|
const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
|
|
183
186
|
await fse__namespace.default.ensureFile(configFilePath);
|
|
@@ -193,7 +196,7 @@ async function saveLocalConfig(data) {
|
|
|
193
196
|
await fse__namespace.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
|
|
194
197
|
}
|
|
195
198
|
const name = "@strapi/cloud-cli";
|
|
196
|
-
const version = "5.4.
|
|
199
|
+
const version = "5.4.1";
|
|
197
200
|
const description = "Commands to interact with the Strapi Cloud";
|
|
198
201
|
const keywords = [
|
|
199
202
|
"strapi",
|
|
@@ -238,8 +241,9 @@ const scripts = {
|
|
|
238
241
|
watch: "pack-up watch"
|
|
239
242
|
};
|
|
240
243
|
const dependencies = {
|
|
241
|
-
"@strapi/utils": "5.4.
|
|
244
|
+
"@strapi/utils": "5.4.1",
|
|
242
245
|
axios: "1.7.4",
|
|
246
|
+
boxen: "5.1.2",
|
|
243
247
|
chalk: "4.1.2",
|
|
244
248
|
"cli-progress": "3.12.0",
|
|
245
249
|
commander: "8.3.0",
|
|
@@ -263,8 +267,8 @@ const devDependencies = {
|
|
|
263
267
|
"@types/cli-progress": "3.11.5",
|
|
264
268
|
"@types/eventsource": "1.1.15",
|
|
265
269
|
"@types/lodash": "^4.14.191",
|
|
266
|
-
"eslint-config-custom": "5.4.
|
|
267
|
-
tsconfig: "5.4.
|
|
270
|
+
"eslint-config-custom": "5.4.1",
|
|
271
|
+
tsconfig: "5.4.1"
|
|
268
272
|
};
|
|
269
273
|
const engines = {
|
|
270
274
|
node: ">=18.0.0 <=22.x.x",
|
|
@@ -296,7 +300,7 @@ const packageJson = {
|
|
|
296
300
|
};
|
|
297
301
|
const VERSION = "v1";
|
|
298
302
|
async function cloudApiFactory({ logger }, token) {
|
|
299
|
-
const localConfig = await getLocalConfig();
|
|
303
|
+
const localConfig = await getLocalConfig$1();
|
|
300
304
|
const customHeaders = {
|
|
301
305
|
"x-device-id": localConfig.deviceId,
|
|
302
306
|
"x-app-version": packageJson.version,
|
|
@@ -404,6 +408,20 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
404
408
|
throw error;
|
|
405
409
|
}
|
|
406
410
|
},
|
|
411
|
+
async listLinkEnvironments({ name: name2 }) {
|
|
412
|
+
try {
|
|
413
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}/environments-linkable`);
|
|
414
|
+
if (response.status !== 200) {
|
|
415
|
+
throw new Error("Error fetching cloud environments from the server.");
|
|
416
|
+
}
|
|
417
|
+
return response;
|
|
418
|
+
} catch (error) {
|
|
419
|
+
logger.debug(
|
|
420
|
+
"🥲 Oops! Couldn't retrieve your project's environments from the server. Please try again."
|
|
421
|
+
);
|
|
422
|
+
throw error;
|
|
423
|
+
}
|
|
424
|
+
},
|
|
407
425
|
async getProject({ name: name2 }) {
|
|
408
426
|
try {
|
|
409
427
|
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
@@ -427,26 +445,43 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
427
445
|
};
|
|
428
446
|
}
|
|
429
447
|
const LOCAL_SAVE_FILENAME = ".strapi-cloud.json";
|
|
448
|
+
const getFilePath = (directoryPath) => path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
430
449
|
async function save(data, { directoryPath } = {}) {
|
|
431
|
-
const
|
|
432
|
-
const storedData = { ...alreadyInFileData, ...data };
|
|
433
|
-
const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
450
|
+
const pathToFile = getFilePath(directoryPath);
|
|
434
451
|
await fse__namespace.default.ensureDir(path__namespace.default.dirname(pathToFile));
|
|
435
|
-
await fse__namespace.default.writeJson(pathToFile,
|
|
452
|
+
await fse__namespace.default.writeJson(pathToFile, data, { encoding: "utf8" });
|
|
436
453
|
}
|
|
437
454
|
async function retrieve({
|
|
438
455
|
directoryPath
|
|
439
456
|
} = {}) {
|
|
440
|
-
const pathToFile =
|
|
457
|
+
const pathToFile = getFilePath(directoryPath);
|
|
441
458
|
const pathExists = await fse__namespace.default.pathExists(pathToFile);
|
|
442
459
|
if (!pathExists) {
|
|
443
460
|
return {};
|
|
444
461
|
}
|
|
445
462
|
return fse__namespace.default.readJSON(pathToFile, { encoding: "utf8" });
|
|
446
463
|
}
|
|
464
|
+
async function patch(patchData, { directoryPath } = {}) {
|
|
465
|
+
const pathToFile = getFilePath(directoryPath);
|
|
466
|
+
const existingData = await retrieve({ directoryPath });
|
|
467
|
+
if (!existingData) {
|
|
468
|
+
throw new Error("No configuration data found to patch.");
|
|
469
|
+
}
|
|
470
|
+
const newData = lodash.merge(existingData, patchData);
|
|
471
|
+
await fse__namespace.default.writeJson(pathToFile, newData, { encoding: "utf8" });
|
|
472
|
+
}
|
|
473
|
+
async function deleteConfig({ directoryPath } = {}) {
|
|
474
|
+
const pathToFile = getFilePath(directoryPath);
|
|
475
|
+
const pathExists = await fse__namespace.default.pathExists(pathToFile);
|
|
476
|
+
if (pathExists) {
|
|
477
|
+
await fse__namespace.default.remove(pathToFile);
|
|
478
|
+
}
|
|
479
|
+
}
|
|
447
480
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
448
481
|
__proto__: null,
|
|
449
482
|
LOCAL_SAVE_FILENAME,
|
|
483
|
+
deleteConfig,
|
|
484
|
+
patch,
|
|
450
485
|
retrieve,
|
|
451
486
|
save
|
|
452
487
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
@@ -454,7 +489,7 @@ let cliConfig;
|
|
|
454
489
|
async function tokenServiceFactory({ logger }) {
|
|
455
490
|
const cloudApiService = await cloudApiFactory({ logger });
|
|
456
491
|
async function saveToken(str) {
|
|
457
|
-
const appConfig = await getLocalConfig();
|
|
492
|
+
const appConfig = await getLocalConfig$1();
|
|
458
493
|
if (!appConfig) {
|
|
459
494
|
logger.error("There was a problem saving your token. Please try again.");
|
|
460
495
|
return;
|
|
@@ -468,7 +503,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
468
503
|
}
|
|
469
504
|
}
|
|
470
505
|
async function retrieveToken() {
|
|
471
|
-
const appConfig = await getLocalConfig();
|
|
506
|
+
const appConfig = await getLocalConfig$1();
|
|
472
507
|
if (appConfig.token) {
|
|
473
508
|
if (await isTokenValid(appConfig.token)) {
|
|
474
509
|
return appConfig.token;
|
|
@@ -530,7 +565,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
530
565
|
}
|
|
531
566
|
}
|
|
532
567
|
async function eraseToken() {
|
|
533
|
-
const appConfig = await getLocalConfig();
|
|
568
|
+
const appConfig = await getLocalConfig$1();
|
|
534
569
|
if (!appConfig) {
|
|
535
570
|
return;
|
|
536
571
|
}
|
|
@@ -976,7 +1011,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
976
1011
|
throw e;
|
|
977
1012
|
}
|
|
978
1013
|
}
|
|
979
|
-
const action$
|
|
1014
|
+
const action$6 = async (ctx) => {
|
|
980
1015
|
const { logger } = ctx;
|
|
981
1016
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
982
1017
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -1105,7 +1140,14 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
1105
1140
|
});
|
|
1106
1141
|
};
|
|
1107
1142
|
};
|
|
1108
|
-
const
|
|
1143
|
+
const boxenOptions = {
|
|
1144
|
+
padding: 1,
|
|
1145
|
+
margin: 1,
|
|
1146
|
+
align: "center",
|
|
1147
|
+
borderColor: "yellow",
|
|
1148
|
+
borderStyle: "round"
|
|
1149
|
+
};
|
|
1150
|
+
const QUIT_OPTION$2 = "Quit";
|
|
1109
1151
|
async function promptForEnvironment(environments) {
|
|
1110
1152
|
const choices = environments.map((env) => ({ name: env, value: env }));
|
|
1111
1153
|
const { selectedEnvironment } = await inquirer__default.default.prompt([
|
|
@@ -1113,22 +1155,12 @@ async function promptForEnvironment(environments) {
|
|
|
1113
1155
|
type: "list",
|
|
1114
1156
|
name: "selectedEnvironment",
|
|
1115
1157
|
message: "Select the environment to deploy:",
|
|
1116
|
-
choices: [...choices, { name: chalk__default.default.grey(`(${QUIT_OPTION$
|
|
1158
|
+
choices: [...choices, { name: chalk__default.default.grey(`(${QUIT_OPTION$2})`), value: null }]
|
|
1117
1159
|
}
|
|
1118
1160
|
]);
|
|
1119
1161
|
if (selectedEnvironment === null) {
|
|
1120
1162
|
process.exit(1);
|
|
1121
1163
|
}
|
|
1122
|
-
const { confirm } = await inquirer__default.default.prompt([
|
|
1123
|
-
{
|
|
1124
|
-
type: "confirm",
|
|
1125
|
-
name: "confirm",
|
|
1126
|
-
message: `Do you want to proceed with deployment to ${chalk__default.default.cyan(selectedEnvironment)}?`
|
|
1127
|
-
}
|
|
1128
|
-
]);
|
|
1129
|
-
if (!confirm) {
|
|
1130
|
-
process.exit(1);
|
|
1131
|
-
}
|
|
1132
1164
|
return selectedEnvironment;
|
|
1133
1165
|
}
|
|
1134
1166
|
async function upload(ctx, project, token, maxProjectFileSize) {
|
|
@@ -1209,11 +1241,11 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1209
1241
|
process.exit(1);
|
|
1210
1242
|
}
|
|
1211
1243
|
}
|
|
1212
|
-
async function getProject
|
|
1244
|
+
async function getProject(ctx) {
|
|
1213
1245
|
const { project } = await retrieve();
|
|
1214
1246
|
if (!project) {
|
|
1215
1247
|
try {
|
|
1216
|
-
return await action$
|
|
1248
|
+
return await action$6(ctx);
|
|
1217
1249
|
} catch (e) {
|
|
1218
1250
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1219
1251
|
ctx.logger.debug(e);
|
|
@@ -1234,24 +1266,54 @@ async function getConfig({
|
|
|
1234
1266
|
return null;
|
|
1235
1267
|
}
|
|
1236
1268
|
}
|
|
1237
|
-
|
|
1269
|
+
function validateEnvironment(ctx, environment, environments) {
|
|
1270
|
+
if (!environments.includes(environment)) {
|
|
1271
|
+
ctx.logger.error(`Environment ${environment} does not exist.`);
|
|
1272
|
+
process.exit(1);
|
|
1273
|
+
}
|
|
1274
|
+
}
|
|
1275
|
+
async function getTargetEnvironment(ctx, opts, project, environments) {
|
|
1276
|
+
if (opts.env) {
|
|
1277
|
+
validateEnvironment(ctx, opts.env, environments);
|
|
1278
|
+
return opts.env;
|
|
1279
|
+
}
|
|
1280
|
+
if (project.targetEnvironment) {
|
|
1281
|
+
return project.targetEnvironment;
|
|
1282
|
+
}
|
|
1283
|
+
if (environments.length > 1) {
|
|
1284
|
+
return promptForEnvironment(environments);
|
|
1285
|
+
}
|
|
1286
|
+
return environments[0];
|
|
1287
|
+
}
|
|
1288
|
+
function hasPendingOrLiveDeployment(environments, targetEnvironment) {
|
|
1289
|
+
const environment = environments.find((env) => env.name === targetEnvironment);
|
|
1290
|
+
if (!environment) {
|
|
1291
|
+
throw new Error(`Environment details ${targetEnvironment} not found.`);
|
|
1292
|
+
}
|
|
1293
|
+
return environment.hasPendingDeployment || environment.hasLiveDeployment || false;
|
|
1294
|
+
}
|
|
1295
|
+
const action$5 = async (ctx, opts) => {
|
|
1238
1296
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1239
1297
|
const token = await getValidToken(ctx, promptLogin);
|
|
1240
1298
|
if (!token) {
|
|
1241
1299
|
return;
|
|
1242
1300
|
}
|
|
1243
|
-
const project = await getProject
|
|
1301
|
+
const project = await getProject(ctx);
|
|
1244
1302
|
if (!project) {
|
|
1245
1303
|
return;
|
|
1246
1304
|
}
|
|
1247
1305
|
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1306
|
+
let projectData;
|
|
1248
1307
|
let environments;
|
|
1308
|
+
let environmentsDetails;
|
|
1249
1309
|
try {
|
|
1250
1310
|
const {
|
|
1251
|
-
data: { data
|
|
1311
|
+
data: { data, metadata }
|
|
1252
1312
|
} = await cloudApiService.getProject({ name: project.name });
|
|
1253
|
-
|
|
1313
|
+
projectData = data;
|
|
1254
1314
|
environments = projectData.environments;
|
|
1315
|
+
environmentsDetails = projectData.environmentsDetails;
|
|
1316
|
+
const isProjectSuspended = projectData.suspendedAt;
|
|
1255
1317
|
if (isProjectSuspended) {
|
|
1256
1318
|
ctx.logger.log(
|
|
1257
1319
|
"\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
|
|
@@ -1298,22 +1360,34 @@ Please link your local project to an existing Strapi Cloud project using the ${c
|
|
|
1298
1360
|
);
|
|
1299
1361
|
maxSize = 1e8;
|
|
1300
1362
|
}
|
|
1301
|
-
|
|
1302
|
-
if (opts.
|
|
1303
|
-
|
|
1304
|
-
|
|
1305
|
-
|
|
1363
|
+
project.targetEnvironment = await getTargetEnvironment(ctx, opts, project, environments);
|
|
1364
|
+
if (!opts.force) {
|
|
1365
|
+
const shouldDisplayWarning = hasPendingOrLiveDeployment(
|
|
1366
|
+
environmentsDetails,
|
|
1367
|
+
project.targetEnvironment
|
|
1368
|
+
);
|
|
1369
|
+
if (shouldDisplayWarning) {
|
|
1370
|
+
ctx.logger.log(boxen__default.default(cliConfig2.projectDeployment.confirmationText, boxenOptions));
|
|
1371
|
+
const { confirm } = await inquirer__default.default.prompt([
|
|
1372
|
+
{
|
|
1373
|
+
type: "confirm",
|
|
1374
|
+
name: "confirm",
|
|
1375
|
+
message: `Do you want to proceed with deployment to ${chalk__default.default.cyan(projectData.displayName)} on ${chalk__default.default.cyan(project.targetEnvironment)} environment?`
|
|
1376
|
+
}
|
|
1377
|
+
]);
|
|
1378
|
+
if (!confirm) {
|
|
1379
|
+
process.exit(1);
|
|
1380
|
+
}
|
|
1306
1381
|
}
|
|
1307
|
-
targetEnvironment = opts.environment;
|
|
1308
|
-
} else {
|
|
1309
|
-
targetEnvironment = environments.length > 1 ? await promptForEnvironment(environments) : environments[0];
|
|
1310
1382
|
}
|
|
1311
|
-
project.targetEnvironment = targetEnvironment;
|
|
1312
1383
|
const buildId = await upload(ctx, project, token, maxSize);
|
|
1313
1384
|
if (!buildId) {
|
|
1314
1385
|
return;
|
|
1315
1386
|
}
|
|
1316
1387
|
try {
|
|
1388
|
+
ctx.logger.log(
|
|
1389
|
+
`🚀 Deploying project to ${chalk__default.default.cyan(project.targetEnvironment ?? `production`)} environment...`
|
|
1390
|
+
);
|
|
1317
1391
|
notificationService(`${apiConfig.apiBaseUrl}/notifications`, token, cliConfig2);
|
|
1318
1392
|
await buildLogsService(`${apiConfig.apiBaseUrl}/v1/logs/${buildId}`, token, cliConfig2);
|
|
1319
1393
|
ctx.logger.log(
|
|
@@ -1358,17 +1432,16 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1358
1432
|
process.exit(1);
|
|
1359
1433
|
});
|
|
1360
1434
|
};
|
|
1361
|
-
const command$
|
|
1362
|
-
return commander.createCommand("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").option("-e, --
|
|
1435
|
+
const command$7 = ({ ctx }) => {
|
|
1436
|
+
return commander.createCommand("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").option("-f, --force", "Skip confirmation to deploy").option("-e, --env <name>", "Specify the environment to deploy").action((opts) => runAction("deploy", action$5)(ctx, opts));
|
|
1363
1437
|
};
|
|
1364
1438
|
const deployProject = {
|
|
1365
1439
|
name: "deploy-project",
|
|
1366
1440
|
description: "Deploy a Strapi Cloud project",
|
|
1367
|
-
action: action$
|
|
1368
|
-
command: command$
|
|
1441
|
+
action: action$5,
|
|
1442
|
+
command: command$7
|
|
1369
1443
|
};
|
|
1370
|
-
|
|
1371
|
-
async function getExistingConfig(ctx) {
|
|
1444
|
+
async function getLocalConfig(ctx) {
|
|
1372
1445
|
try {
|
|
1373
1446
|
return await retrieve();
|
|
1374
1447
|
} catch (e) {
|
|
@@ -1377,6 +1450,21 @@ async function getExistingConfig(ctx) {
|
|
|
1377
1450
|
return null;
|
|
1378
1451
|
}
|
|
1379
1452
|
}
|
|
1453
|
+
async function getLocalProject(ctx) {
|
|
1454
|
+
const localConfig = await getLocalConfig(ctx);
|
|
1455
|
+
if (!localConfig || !localConfig.project) {
|
|
1456
|
+
ctx.logger.warn(
|
|
1457
|
+
`
|
|
1458
|
+
We couldn't find a valid local project config.
|
|
1459
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk__default.default.cyan(
|
|
1460
|
+
"link"
|
|
1461
|
+
)} command.`
|
|
1462
|
+
);
|
|
1463
|
+
process.exit(1);
|
|
1464
|
+
}
|
|
1465
|
+
return localConfig.project;
|
|
1466
|
+
}
|
|
1467
|
+
const QUIT_OPTION$1 = "Quit";
|
|
1380
1468
|
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1381
1469
|
if (existingConfig && existingConfig.project) {
|
|
1382
1470
|
const { shouldRelink } = await inquirer__default.default.prompt([
|
|
@@ -1406,7 +1494,7 @@ async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
|
1406
1494
|
} = await cloudApiService.listLinkProjects();
|
|
1407
1495
|
spinner.succeed();
|
|
1408
1496
|
if (!Array.isArray(projectList)) {
|
|
1409
|
-
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1497
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1410
1498
|
return null;
|
|
1411
1499
|
}
|
|
1412
1500
|
const projects = projectList.filter(
|
|
@@ -1418,7 +1506,7 @@ async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
|
1418
1506
|
};
|
|
1419
1507
|
});
|
|
1420
1508
|
if (projects.length === 0) {
|
|
1421
|
-
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1509
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1422
1510
|
return null;
|
|
1423
1511
|
}
|
|
1424
1512
|
return projects;
|
|
@@ -1436,7 +1524,7 @@ async function getUserSelection(ctx, projects) {
|
|
|
1436
1524
|
type: "list",
|
|
1437
1525
|
name: "linkProject",
|
|
1438
1526
|
message: "Which project do you want to link?",
|
|
1439
|
-
choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1527
|
+
choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION$1})`), value: null }]
|
|
1440
1528
|
}
|
|
1441
1529
|
]);
|
|
1442
1530
|
if (!answer.linkProject) {
|
|
@@ -1449,7 +1537,7 @@ async function getUserSelection(ctx, projects) {
|
|
|
1449
1537
|
return null;
|
|
1450
1538
|
}
|
|
1451
1539
|
}
|
|
1452
|
-
const action$
|
|
1540
|
+
const action$4 = async (ctx) => {
|
|
1453
1541
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1454
1542
|
const token = await getValidToken(ctx, promptLogin);
|
|
1455
1543
|
const { logger } = ctx;
|
|
@@ -1457,7 +1545,7 @@ const action$3 = async (ctx) => {
|
|
|
1457
1545
|
return;
|
|
1458
1546
|
}
|
|
1459
1547
|
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1460
|
-
const existingConfig = await
|
|
1548
|
+
const existingConfig = await getLocalConfig(ctx);
|
|
1461
1549
|
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1462
1550
|
if (!shouldRelink) {
|
|
1463
1551
|
return;
|
|
@@ -1492,7 +1580,9 @@ const action$3 = async (ctx) => {
|
|
|
1492
1580
|
return;
|
|
1493
1581
|
}
|
|
1494
1582
|
await save({ project: answer.linkProject });
|
|
1495
|
-
logger.log(
|
|
1583
|
+
logger.log(
|
|
1584
|
+
` You have successfully linked your project to ${chalk__default.default.cyan(answer.linkProject.displayName)}. You are now able to deploy your project.`
|
|
1585
|
+
);
|
|
1496
1586
|
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1497
1587
|
projectInternalName: answer.linkProject
|
|
1498
1588
|
});
|
|
@@ -1504,16 +1594,16 @@ const action$3 = async (ctx) => {
|
|
|
1504
1594
|
});
|
|
1505
1595
|
}
|
|
1506
1596
|
};
|
|
1507
|
-
const command$
|
|
1508
|
-
command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$
|
|
1597
|
+
const command$6 = ({ command: command2, ctx }) => {
|
|
1598
|
+
command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$4)(ctx));
|
|
1509
1599
|
};
|
|
1510
1600
|
const link = {
|
|
1511
1601
|
name: "link-project",
|
|
1512
1602
|
description: "Link a local directory to a Strapi Cloud project",
|
|
1513
|
-
action: action$
|
|
1514
|
-
command: command$
|
|
1603
|
+
action: action$4,
|
|
1604
|
+
command: command$6
|
|
1515
1605
|
};
|
|
1516
|
-
const command$
|
|
1606
|
+
const command$5 = ({ ctx }) => {
|
|
1517
1607
|
return commander.createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1518
1608
|
"after",
|
|
1519
1609
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
@@ -1523,10 +1613,10 @@ const login = {
|
|
|
1523
1613
|
name: "login",
|
|
1524
1614
|
description: "Strapi Cloud Login",
|
|
1525
1615
|
action: loginAction,
|
|
1526
|
-
command: command$
|
|
1616
|
+
command: command$5
|
|
1527
1617
|
};
|
|
1528
1618
|
const openModule = import("open");
|
|
1529
|
-
const action$
|
|
1619
|
+
const action$3 = async (ctx) => {
|
|
1530
1620
|
const { logger } = ctx;
|
|
1531
1621
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1532
1622
|
const token = await retrieveToken();
|
|
@@ -1558,25 +1648,25 @@ const action$2 = async (ctx) => {
|
|
|
1558
1648
|
}
|
|
1559
1649
|
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1560
1650
|
};
|
|
1561
|
-
const command$
|
|
1562
|
-
return commander.createCommand("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$
|
|
1651
|
+
const command$4 = ({ ctx }) => {
|
|
1652
|
+
return commander.createCommand("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$3)(ctx));
|
|
1563
1653
|
};
|
|
1564
1654
|
const logout = {
|
|
1565
1655
|
name: "logout",
|
|
1566
1656
|
description: "Strapi Cloud Logout",
|
|
1567
|
-
action: action$
|
|
1568
|
-
command: command$
|
|
1657
|
+
action: action$3,
|
|
1658
|
+
command: command$4
|
|
1569
1659
|
};
|
|
1570
|
-
const command$
|
|
1571
|
-
return commander.createCommand("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$
|
|
1660
|
+
const command$3 = ({ ctx }) => {
|
|
1661
|
+
return commander.createCommand("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$6)(ctx));
|
|
1572
1662
|
};
|
|
1573
1663
|
const createProject = {
|
|
1574
1664
|
name: "create-project",
|
|
1575
1665
|
description: "Create a new project",
|
|
1576
|
-
action: action$
|
|
1577
|
-
command: command$
|
|
1666
|
+
action: action$6,
|
|
1667
|
+
command: command$3
|
|
1578
1668
|
};
|
|
1579
|
-
const action$
|
|
1669
|
+
const action$2 = async (ctx) => {
|
|
1580
1670
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1581
1671
|
const token = await getValidToken(ctx, promptLogin);
|
|
1582
1672
|
const { logger } = ctx;
|
|
@@ -1596,37 +1686,23 @@ const action$1 = async (ctx) => {
|
|
|
1596
1686
|
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1597
1687
|
}
|
|
1598
1688
|
};
|
|
1599
|
-
const command$
|
|
1600
|
-
command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action$
|
|
1689
|
+
const command$2 = ({ command: command2, ctx }) => {
|
|
1690
|
+
command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action$2)(ctx));
|
|
1601
1691
|
};
|
|
1602
1692
|
const listProjects = {
|
|
1603
1693
|
name: "list-projects",
|
|
1604
1694
|
description: "List Strapi Cloud projects",
|
|
1605
|
-
action: action$
|
|
1606
|
-
command: command$
|
|
1695
|
+
action: action$2,
|
|
1696
|
+
command: command$2
|
|
1607
1697
|
};
|
|
1608
|
-
async
|
|
1609
|
-
const { project } = await retrieve();
|
|
1610
|
-
if (!project) {
|
|
1611
|
-
ctx.logger.warn(
|
|
1612
|
-
`
|
|
1613
|
-
We couldn't find a valid local project config.
|
|
1614
|
-
Please link your local project to an existing Strapi Cloud project using the ${chalk__default.default.cyan(
|
|
1615
|
-
"link"
|
|
1616
|
-
)} command`
|
|
1617
|
-
);
|
|
1618
|
-
process.exit(1);
|
|
1619
|
-
}
|
|
1620
|
-
return project;
|
|
1621
|
-
}
|
|
1622
|
-
const action = async (ctx) => {
|
|
1698
|
+
const action$1 = async (ctx) => {
|
|
1623
1699
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1624
1700
|
const token = await getValidToken(ctx, promptLogin);
|
|
1625
1701
|
const { logger } = ctx;
|
|
1626
1702
|
if (!token) {
|
|
1627
1703
|
return;
|
|
1628
1704
|
}
|
|
1629
|
-
const project = await
|
|
1705
|
+
const project = await getLocalProject(ctx);
|
|
1630
1706
|
if (!project) {
|
|
1631
1707
|
ctx.logger.debug(`No valid local project configuration was found.`);
|
|
1632
1708
|
return;
|
|
@@ -1666,7 +1742,7 @@ Please link your local project to an existing Strapi Cloud project using the ${c
|
|
|
1666
1742
|
};
|
|
1667
1743
|
function defineCloudNamespace(command2, ctx) {
|
|
1668
1744
|
const cloud = command2.command("cloud").description("Manage Strapi Cloud projects");
|
|
1669
|
-
cloud.command("environments").description("Alias for cloud environment list").action(() => runAction("list", action)(ctx));
|
|
1745
|
+
cloud.command("environments").description("Alias for cloud environment list").action(() => runAction("list", action$1)(ctx));
|
|
1670
1746
|
return cloud;
|
|
1671
1747
|
}
|
|
1672
1748
|
let environmentCmd = null;
|
|
@@ -1677,13 +1753,127 @@ const initializeEnvironmentCommand = (command2, ctx) => {
|
|
|
1677
1753
|
}
|
|
1678
1754
|
return environmentCmd;
|
|
1679
1755
|
};
|
|
1680
|
-
const command = ({ command: command2, ctx }) => {
|
|
1756
|
+
const command$1 = ({ command: command2, ctx }) => {
|
|
1681
1757
|
const environmentCmd2 = initializeEnvironmentCommand(command2, ctx);
|
|
1682
|
-
environmentCmd2.command("list").description("List Strapi Cloud project environments").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("list", action)(ctx));
|
|
1758
|
+
environmentCmd2.command("list").description("List Strapi Cloud project environments").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("list", action$1)(ctx));
|
|
1683
1759
|
};
|
|
1684
1760
|
const listEnvironments = {
|
|
1685
1761
|
name: "list-environments",
|
|
1686
1762
|
description: "List Strapi Cloud environments",
|
|
1763
|
+
action: action$1,
|
|
1764
|
+
command: command$1
|
|
1765
|
+
};
|
|
1766
|
+
const QUIT_OPTION = "Quit";
|
|
1767
|
+
const action = async (ctx) => {
|
|
1768
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1769
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1770
|
+
const { logger } = ctx;
|
|
1771
|
+
if (!token) {
|
|
1772
|
+
return;
|
|
1773
|
+
}
|
|
1774
|
+
const project = await getLocalProject(ctx);
|
|
1775
|
+
if (!project) {
|
|
1776
|
+
logger.debug(`No valid local project configuration was found.`);
|
|
1777
|
+
return;
|
|
1778
|
+
}
|
|
1779
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1780
|
+
const environments = await getEnvironmentsList(ctx, cloudApiService, project);
|
|
1781
|
+
if (!environments) {
|
|
1782
|
+
logger.debug(`Fetching environments failed.`);
|
|
1783
|
+
return;
|
|
1784
|
+
}
|
|
1785
|
+
if (environments.length === 0) {
|
|
1786
|
+
logger.log(
|
|
1787
|
+
`The only available environment is already linked. You can add a new one from your project settings on the Strapi Cloud dashboard.`
|
|
1788
|
+
);
|
|
1789
|
+
return;
|
|
1790
|
+
}
|
|
1791
|
+
const answer = await promptUserForEnvironment(ctx, environments);
|
|
1792
|
+
if (!answer) {
|
|
1793
|
+
return;
|
|
1794
|
+
}
|
|
1795
|
+
await trackEvent(ctx, cloudApiService, "willLinkEnvironment", {
|
|
1796
|
+
projectName: project.name,
|
|
1797
|
+
environmentName: answer.targetEnvironment
|
|
1798
|
+
});
|
|
1799
|
+
try {
|
|
1800
|
+
await patch({ project: { targetEnvironment: answer.targetEnvironment } });
|
|
1801
|
+
} catch (e) {
|
|
1802
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkEnvironment", {
|
|
1803
|
+
projectName: project.name,
|
|
1804
|
+
environmentName: answer.targetEnvironment
|
|
1805
|
+
});
|
|
1806
|
+
logger.debug("Failed to link environment", e);
|
|
1807
|
+
logger.error(
|
|
1808
|
+
"Failed to link the environment. If this issue persists, try re-linking your project or contact support."
|
|
1809
|
+
);
|
|
1810
|
+
process.exit(1);
|
|
1811
|
+
}
|
|
1812
|
+
logger.log(
|
|
1813
|
+
` You have successfully linked your project to ${chalk__default.default.cyan(answer.targetEnvironment)}, on ${chalk__default.default.cyan(project.displayName)}. You are now able to deploy your project.`
|
|
1814
|
+
);
|
|
1815
|
+
await trackEvent(ctx, cloudApiService, "didLinkEnvironment", {
|
|
1816
|
+
projectName: project.name,
|
|
1817
|
+
environmentName: answer.targetEnvironment
|
|
1818
|
+
});
|
|
1819
|
+
};
|
|
1820
|
+
async function promptUserForEnvironment(ctx, environments) {
|
|
1821
|
+
const { logger } = ctx;
|
|
1822
|
+
try {
|
|
1823
|
+
const answer = await inquirer__default.default.prompt([
|
|
1824
|
+
{
|
|
1825
|
+
type: "list",
|
|
1826
|
+
name: "targetEnvironment",
|
|
1827
|
+
message: "Which environment do you want to link?",
|
|
1828
|
+
choices: [...environments, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1829
|
+
}
|
|
1830
|
+
]);
|
|
1831
|
+
if (!answer.targetEnvironment) {
|
|
1832
|
+
return null;
|
|
1833
|
+
}
|
|
1834
|
+
return answer;
|
|
1835
|
+
} catch (e) {
|
|
1836
|
+
logger.debug("Failed to get user input", e);
|
|
1837
|
+
logger.error("An error occurred while trying to get your environment selection.");
|
|
1838
|
+
return null;
|
|
1839
|
+
}
|
|
1840
|
+
}
|
|
1841
|
+
async function getEnvironmentsList(ctx, cloudApiService, project) {
|
|
1842
|
+
const spinner = ctx.logger.spinner("Fetching environments...\n").start();
|
|
1843
|
+
try {
|
|
1844
|
+
const {
|
|
1845
|
+
data: { data: environmentsList }
|
|
1846
|
+
} = await cloudApiService.listLinkEnvironments({ name: project.name });
|
|
1847
|
+
if (!Array.isArray(environmentsList) || environmentsList.length === 0) {
|
|
1848
|
+
throw new Error("Environments not found in server response");
|
|
1849
|
+
}
|
|
1850
|
+
spinner.succeed();
|
|
1851
|
+
return environmentsList.filter(
|
|
1852
|
+
(environment) => environment.name !== project.targetEnvironment
|
|
1853
|
+
);
|
|
1854
|
+
} catch (e) {
|
|
1855
|
+
if (e.response && e.response.status === 404) {
|
|
1856
|
+
spinner.succeed();
|
|
1857
|
+
ctx.logger.warn(
|
|
1858
|
+
`
|
|
1859
|
+
The project associated with this folder does not exist in Strapi Cloud.
|
|
1860
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk__default.default.cyan(
|
|
1861
|
+
"link"
|
|
1862
|
+
)} command.`
|
|
1863
|
+
);
|
|
1864
|
+
} else {
|
|
1865
|
+
spinner.fail("An error occurred while fetching environments data from Strapi Cloud.");
|
|
1866
|
+
ctx.logger.debug("Failed to list environments", e);
|
|
1867
|
+
}
|
|
1868
|
+
}
|
|
1869
|
+
}
|
|
1870
|
+
const command = ({ command: command2, ctx }) => {
|
|
1871
|
+
const environmentCmd2 = initializeEnvironmentCommand(command2, ctx);
|
|
1872
|
+
environmentCmd2.command("link").description("Link project to a specific Strapi Cloud project environment").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action)(ctx));
|
|
1873
|
+
};
|
|
1874
|
+
const linkEnvironment = {
|
|
1875
|
+
name: "link-environment",
|
|
1876
|
+
description: "Link Strapi Cloud environment to a local project",
|
|
1687
1877
|
action,
|
|
1688
1878
|
command
|
|
1689
1879
|
};
|
|
@@ -1693,12 +1883,21 @@ const cli = {
|
|
|
1693
1883
|
login,
|
|
1694
1884
|
logout,
|
|
1695
1885
|
createProject,
|
|
1886
|
+
linkEnvironment,
|
|
1696
1887
|
listProjects,
|
|
1697
1888
|
listEnvironments
|
|
1698
1889
|
};
|
|
1699
|
-
const cloudCommands = [
|
|
1890
|
+
const cloudCommands = [
|
|
1891
|
+
deployProject,
|
|
1892
|
+
link,
|
|
1893
|
+
login,
|
|
1894
|
+
logout,
|
|
1895
|
+
linkEnvironment,
|
|
1896
|
+
listProjects,
|
|
1897
|
+
listEnvironments
|
|
1898
|
+
];
|
|
1700
1899
|
async function initCloudCLIConfig() {
|
|
1701
|
-
const localConfig = await getLocalConfig();
|
|
1900
|
+
const localConfig = await getLocalConfig$1();
|
|
1702
1901
|
if (!localConfig.deviceId) {
|
|
1703
1902
|
localConfig.deviceId = crypto__default.default.randomUUID();
|
|
1704
1903
|
}
|