@strapi/cloud-cli 0.0.0-next.6ed779c066310248c506ce3d2cdae97f59f700ef → 0.0.0-next.7315bad3dd6542d457c3c837db874e3e6336ae9f
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 +2 -2
- package/dist/bin.js.map +1 -1
- package/dist/index.js +333 -88
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +330 -85
- package/dist/index.mjs.map +1 -1
- package/dist/src/cloud/command.d.ts +1 -1
- package/dist/src/cloud/command.d.ts.map +1 -1
- package/dist/src/deploy-project/action.d.ts +5 -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/command.d.ts +1 -1
- package/dist/src/environment/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/environment/list/command.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 +21 -3
- 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/services/token.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/dist/src/utils/helpers.d.ts.map +1 -1
- package/dist/src/utils/pkg.d.ts.map +1 -1
- package/package.json +7 -6
package/dist/index.mjs
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import crypto$1 from "crypto";
|
|
2
2
|
import * as fse from "fs-extra";
|
|
3
3
|
import fse__default from "fs-extra";
|
|
4
|
+
import inquirer from "inquirer";
|
|
5
|
+
import boxen from "boxen";
|
|
4
6
|
import * as path from "path";
|
|
5
7
|
import path__default from "path";
|
|
6
8
|
import chalk from "chalk";
|
|
@@ -9,10 +11,10 @@ import * as crypto from "node:crypto";
|
|
|
9
11
|
import { env } from "@strapi/utils";
|
|
10
12
|
import * as tar from "tar";
|
|
11
13
|
import { minimatch } from "minimatch";
|
|
12
|
-
import inquirer from "inquirer";
|
|
13
14
|
import { defaults, has } from "lodash/fp";
|
|
14
15
|
import os from "os";
|
|
15
16
|
import XDGAppPaths from "xdg-app-paths";
|
|
17
|
+
import { merge } from "lodash";
|
|
16
18
|
import jwksClient from "jwks-rsa";
|
|
17
19
|
import jwt from "jsonwebtoken";
|
|
18
20
|
import stringify from "fast-safe-stringify";
|
|
@@ -78,8 +80,7 @@ const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
|
|
|
78
80
|
const readGitignore = async (folderPath) => {
|
|
79
81
|
const gitignorePath = path.resolve(folderPath, ".gitignore");
|
|
80
82
|
const pathExist = await fse.pathExists(gitignorePath);
|
|
81
|
-
if (!pathExist)
|
|
82
|
-
return [];
|
|
83
|
+
if (!pathExist) return [];
|
|
83
84
|
const gitignoreContent = await fse.readFile(gitignorePath, "utf8");
|
|
84
85
|
return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
|
|
85
86
|
};
|
|
@@ -118,7 +119,7 @@ async function getConfigPath() {
|
|
|
118
119
|
}
|
|
119
120
|
return configPath;
|
|
120
121
|
}
|
|
121
|
-
async function getLocalConfig() {
|
|
122
|
+
async function getLocalConfig$1() {
|
|
122
123
|
const configPath = await getConfigPath();
|
|
123
124
|
const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
|
|
124
125
|
await fse__default.ensureFile(configFilePath);
|
|
@@ -134,7 +135,7 @@ async function saveLocalConfig(data) {
|
|
|
134
135
|
await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
|
|
135
136
|
}
|
|
136
137
|
const name = "@strapi/cloud-cli";
|
|
137
|
-
const version = "5.
|
|
138
|
+
const version = "5.4.2";
|
|
138
139
|
const description = "Commands to interact with the Strapi Cloud";
|
|
139
140
|
const keywords = [
|
|
140
141
|
"strapi",
|
|
@@ -179,8 +180,9 @@ const scripts = {
|
|
|
179
180
|
watch: "pack-up watch"
|
|
180
181
|
};
|
|
181
182
|
const dependencies = {
|
|
182
|
-
"@strapi/utils": "
|
|
183
|
+
"@strapi/utils": "5.4.2",
|
|
183
184
|
axios: "1.7.4",
|
|
185
|
+
boxen: "5.1.2",
|
|
184
186
|
chalk: "4.1.2",
|
|
185
187
|
"cli-progress": "3.12.0",
|
|
186
188
|
commander: "8.3.0",
|
|
@@ -200,17 +202,18 @@ const dependencies = {
|
|
|
200
202
|
yup: "0.32.9"
|
|
201
203
|
};
|
|
202
204
|
const devDependencies = {
|
|
203
|
-
"@strapi/pack-up": "
|
|
205
|
+
"@strapi/pack-up": "5.0.2",
|
|
204
206
|
"@types/cli-progress": "3.11.5",
|
|
205
207
|
"@types/eventsource": "1.1.15",
|
|
206
208
|
"@types/lodash": "^4.14.191",
|
|
207
|
-
"eslint-config-custom": "
|
|
208
|
-
tsconfig: "
|
|
209
|
+
"eslint-config-custom": "5.4.2",
|
|
210
|
+
tsconfig: "5.4.2"
|
|
209
211
|
};
|
|
210
212
|
const engines = {
|
|
211
213
|
node: ">=18.0.0 <=22.x.x",
|
|
212
214
|
npm: ">=6.0.0"
|
|
213
215
|
};
|
|
216
|
+
const gitHead = "7d785703f52464577d077c4618cbe68b44f8a9cd";
|
|
214
217
|
const packageJson = {
|
|
215
218
|
name,
|
|
216
219
|
version,
|
|
@@ -231,11 +234,12 @@ const packageJson = {
|
|
|
231
234
|
scripts,
|
|
232
235
|
dependencies,
|
|
233
236
|
devDependencies,
|
|
234
|
-
engines
|
|
237
|
+
engines,
|
|
238
|
+
gitHead
|
|
235
239
|
};
|
|
236
240
|
const VERSION = "v1";
|
|
237
241
|
async function cloudApiFactory({ logger }, token) {
|
|
238
|
-
const localConfig = await getLocalConfig();
|
|
242
|
+
const localConfig = await getLocalConfig$1();
|
|
239
243
|
const customHeaders = {
|
|
240
244
|
"x-device-id": localConfig.deviceId,
|
|
241
245
|
"x-app-version": packageJson.version,
|
|
@@ -258,7 +262,7 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
258
262
|
deploy({ filePath, project }, { onUploadProgress }) {
|
|
259
263
|
return axiosCloudAPI.post(
|
|
260
264
|
`/deploy/${project.name}`,
|
|
261
|
-
{ file: fse__default.createReadStream(filePath) },
|
|
265
|
+
{ file: fse__default.createReadStream(filePath), targetEnvironment: project.targetEnvironment },
|
|
262
266
|
{
|
|
263
267
|
headers: {
|
|
264
268
|
"Content-Type": "multipart/form-data"
|
|
@@ -343,6 +347,20 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
343
347
|
throw error;
|
|
344
348
|
}
|
|
345
349
|
},
|
|
350
|
+
async listLinkEnvironments({ name: name2 }) {
|
|
351
|
+
try {
|
|
352
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}/environments-linkable`);
|
|
353
|
+
if (response.status !== 200) {
|
|
354
|
+
throw new Error("Error fetching cloud environments from the server.");
|
|
355
|
+
}
|
|
356
|
+
return response;
|
|
357
|
+
} catch (error) {
|
|
358
|
+
logger.debug(
|
|
359
|
+
"🥲 Oops! Couldn't retrieve your project's environments from the server. Please try again."
|
|
360
|
+
);
|
|
361
|
+
throw error;
|
|
362
|
+
}
|
|
363
|
+
},
|
|
346
364
|
async getProject({ name: name2 }) {
|
|
347
365
|
try {
|
|
348
366
|
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
@@ -366,26 +384,43 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
366
384
|
};
|
|
367
385
|
}
|
|
368
386
|
const LOCAL_SAVE_FILENAME = ".strapi-cloud.json";
|
|
387
|
+
const getFilePath = (directoryPath) => path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
369
388
|
async function save(data, { directoryPath } = {}) {
|
|
370
|
-
const
|
|
371
|
-
const storedData = { ...alreadyInFileData, ...data };
|
|
372
|
-
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
389
|
+
const pathToFile = getFilePath(directoryPath);
|
|
373
390
|
await fse__default.ensureDir(path__default.dirname(pathToFile));
|
|
374
|
-
await fse__default.writeJson(pathToFile,
|
|
391
|
+
await fse__default.writeJson(pathToFile, data, { encoding: "utf8" });
|
|
375
392
|
}
|
|
376
393
|
async function retrieve({
|
|
377
394
|
directoryPath
|
|
378
395
|
} = {}) {
|
|
379
|
-
const pathToFile =
|
|
396
|
+
const pathToFile = getFilePath(directoryPath);
|
|
380
397
|
const pathExists = await fse__default.pathExists(pathToFile);
|
|
381
398
|
if (!pathExists) {
|
|
382
399
|
return {};
|
|
383
400
|
}
|
|
384
401
|
return fse__default.readJSON(pathToFile, { encoding: "utf8" });
|
|
385
402
|
}
|
|
403
|
+
async function patch(patchData, { directoryPath } = {}) {
|
|
404
|
+
const pathToFile = getFilePath(directoryPath);
|
|
405
|
+
const existingData = await retrieve({ directoryPath });
|
|
406
|
+
if (!existingData) {
|
|
407
|
+
throw new Error("No configuration data found to patch.");
|
|
408
|
+
}
|
|
409
|
+
const newData = merge(existingData, patchData);
|
|
410
|
+
await fse__default.writeJson(pathToFile, newData, { encoding: "utf8" });
|
|
411
|
+
}
|
|
412
|
+
async function deleteConfig({ directoryPath } = {}) {
|
|
413
|
+
const pathToFile = getFilePath(directoryPath);
|
|
414
|
+
const pathExists = await fse__default.pathExists(pathToFile);
|
|
415
|
+
if (pathExists) {
|
|
416
|
+
await fse__default.remove(pathToFile);
|
|
417
|
+
}
|
|
418
|
+
}
|
|
386
419
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
387
420
|
__proto__: null,
|
|
388
421
|
LOCAL_SAVE_FILENAME,
|
|
422
|
+
deleteConfig,
|
|
423
|
+
patch,
|
|
389
424
|
retrieve,
|
|
390
425
|
save
|
|
391
426
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
@@ -393,7 +428,7 @@ let cliConfig;
|
|
|
393
428
|
async function tokenServiceFactory({ logger }) {
|
|
394
429
|
const cloudApiService = await cloudApiFactory({ logger });
|
|
395
430
|
async function saveToken(str) {
|
|
396
|
-
const appConfig = await getLocalConfig();
|
|
431
|
+
const appConfig = await getLocalConfig$1();
|
|
397
432
|
if (!appConfig) {
|
|
398
433
|
logger.error("There was a problem saving your token. Please try again.");
|
|
399
434
|
return;
|
|
@@ -407,7 +442,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
407
442
|
}
|
|
408
443
|
}
|
|
409
444
|
async function retrieveToken() {
|
|
410
|
-
const appConfig = await getLocalConfig();
|
|
445
|
+
const appConfig = await getLocalConfig$1();
|
|
411
446
|
if (appConfig.token) {
|
|
412
447
|
if (await isTokenValid(appConfig.token)) {
|
|
413
448
|
return appConfig.token;
|
|
@@ -469,7 +504,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
469
504
|
}
|
|
470
505
|
}
|
|
471
506
|
async function eraseToken() {
|
|
472
|
-
const appConfig = await getLocalConfig();
|
|
507
|
+
const appConfig = await getLocalConfig$1();
|
|
473
508
|
if (!appConfig) {
|
|
474
509
|
return;
|
|
475
510
|
}
|
|
@@ -490,8 +525,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
490
525
|
logger.log(
|
|
491
526
|
token ? "Oops! Your token seems expired or invalid. Please login again." : "We couldn't find a valid token. You need to be logged in to use this feature."
|
|
492
527
|
);
|
|
493
|
-
if (!await loginAction2(ctx))
|
|
494
|
-
return null;
|
|
528
|
+
if (!await loginAction2(ctx)) return null;
|
|
495
529
|
token = await retrieveToken();
|
|
496
530
|
}
|
|
497
531
|
return token;
|
|
@@ -915,7 +949,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
915
949
|
throw e;
|
|
916
950
|
}
|
|
917
951
|
}
|
|
918
|
-
const action$
|
|
952
|
+
const action$6 = async (ctx) => {
|
|
919
953
|
const { logger } = ctx;
|
|
920
954
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
921
955
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -1044,6 +1078,29 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
1044
1078
|
});
|
|
1045
1079
|
};
|
|
1046
1080
|
};
|
|
1081
|
+
const boxenOptions = {
|
|
1082
|
+
padding: 1,
|
|
1083
|
+
margin: 1,
|
|
1084
|
+
align: "center",
|
|
1085
|
+
borderColor: "yellow",
|
|
1086
|
+
borderStyle: "round"
|
|
1087
|
+
};
|
|
1088
|
+
const QUIT_OPTION$2 = "Quit";
|
|
1089
|
+
async function promptForEnvironment(environments) {
|
|
1090
|
+
const choices = environments.map((env2) => ({ name: env2, value: env2 }));
|
|
1091
|
+
const { selectedEnvironment } = await inquirer.prompt([
|
|
1092
|
+
{
|
|
1093
|
+
type: "list",
|
|
1094
|
+
name: "selectedEnvironment",
|
|
1095
|
+
message: "Select the environment to deploy:",
|
|
1096
|
+
choices: [...choices, { name: chalk.grey(`(${QUIT_OPTION$2})`), value: null }]
|
|
1097
|
+
}
|
|
1098
|
+
]);
|
|
1099
|
+
if (selectedEnvironment === null) {
|
|
1100
|
+
process.exit(1);
|
|
1101
|
+
}
|
|
1102
|
+
return selectedEnvironment;
|
|
1103
|
+
}
|
|
1047
1104
|
async function upload(ctx, project, token, maxProjectFileSize) {
|
|
1048
1105
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
1049
1106
|
try {
|
|
@@ -1122,11 +1179,11 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1122
1179
|
process.exit(1);
|
|
1123
1180
|
}
|
|
1124
1181
|
}
|
|
1125
|
-
async function getProject
|
|
1182
|
+
async function getProject(ctx) {
|
|
1126
1183
|
const { project } = await retrieve();
|
|
1127
1184
|
if (!project) {
|
|
1128
1185
|
try {
|
|
1129
|
-
return await action$
|
|
1186
|
+
return await action$6(ctx);
|
|
1130
1187
|
} catch (e) {
|
|
1131
1188
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1132
1189
|
ctx.logger.debug(e);
|
|
@@ -1147,21 +1204,53 @@ async function getConfig({
|
|
|
1147
1204
|
return null;
|
|
1148
1205
|
}
|
|
1149
1206
|
}
|
|
1150
|
-
|
|
1207
|
+
function validateEnvironment(ctx, environment, environments) {
|
|
1208
|
+
if (!environments.includes(environment)) {
|
|
1209
|
+
ctx.logger.error(`Environment ${environment} does not exist.`);
|
|
1210
|
+
process.exit(1);
|
|
1211
|
+
}
|
|
1212
|
+
}
|
|
1213
|
+
async function getTargetEnvironment(ctx, opts, project, environments) {
|
|
1214
|
+
if (opts.env) {
|
|
1215
|
+
validateEnvironment(ctx, opts.env, environments);
|
|
1216
|
+
return opts.env;
|
|
1217
|
+
}
|
|
1218
|
+
if (project.targetEnvironment) {
|
|
1219
|
+
return project.targetEnvironment;
|
|
1220
|
+
}
|
|
1221
|
+
if (environments.length > 1) {
|
|
1222
|
+
return promptForEnvironment(environments);
|
|
1223
|
+
}
|
|
1224
|
+
return environments[0];
|
|
1225
|
+
}
|
|
1226
|
+
function hasPendingOrLiveDeployment(environments, targetEnvironment) {
|
|
1227
|
+
const environment = environments.find((env2) => env2.name === targetEnvironment);
|
|
1228
|
+
if (!environment) {
|
|
1229
|
+
throw new Error(`Environment details ${targetEnvironment} not found.`);
|
|
1230
|
+
}
|
|
1231
|
+
return environment.hasPendingDeployment || environment.hasLiveDeployment || false;
|
|
1232
|
+
}
|
|
1233
|
+
const action$5 = async (ctx, opts) => {
|
|
1151
1234
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1152
1235
|
const token = await getValidToken(ctx, promptLogin);
|
|
1153
1236
|
if (!token) {
|
|
1154
1237
|
return;
|
|
1155
1238
|
}
|
|
1156
|
-
const project = await getProject
|
|
1239
|
+
const project = await getProject(ctx);
|
|
1157
1240
|
if (!project) {
|
|
1158
1241
|
return;
|
|
1159
1242
|
}
|
|
1160
1243
|
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1244
|
+
let projectData;
|
|
1245
|
+
let environments;
|
|
1246
|
+
let environmentsDetails;
|
|
1161
1247
|
try {
|
|
1162
1248
|
const {
|
|
1163
|
-
data: { data
|
|
1249
|
+
data: { data, metadata }
|
|
1164
1250
|
} = await cloudApiService.getProject({ name: project.name });
|
|
1251
|
+
projectData = data;
|
|
1252
|
+
environments = projectData.environments;
|
|
1253
|
+
environmentsDetails = projectData.environmentsDetails;
|
|
1165
1254
|
const isProjectSuspended = projectData.suspendedAt;
|
|
1166
1255
|
if (isProjectSuspended) {
|
|
1167
1256
|
ctx.logger.log(
|
|
@@ -1209,11 +1298,34 @@ Please link your local project to an existing Strapi Cloud project using the ${c
|
|
|
1209
1298
|
);
|
|
1210
1299
|
maxSize = 1e8;
|
|
1211
1300
|
}
|
|
1301
|
+
project.targetEnvironment = await getTargetEnvironment(ctx, opts, project, environments);
|
|
1302
|
+
if (!opts.force) {
|
|
1303
|
+
const shouldDisplayWarning = hasPendingOrLiveDeployment(
|
|
1304
|
+
environmentsDetails,
|
|
1305
|
+
project.targetEnvironment
|
|
1306
|
+
);
|
|
1307
|
+
if (shouldDisplayWarning) {
|
|
1308
|
+
ctx.logger.log(boxen(cliConfig2.projectDeployment.confirmationText, boxenOptions));
|
|
1309
|
+
const { confirm } = await inquirer.prompt([
|
|
1310
|
+
{
|
|
1311
|
+
type: "confirm",
|
|
1312
|
+
name: "confirm",
|
|
1313
|
+
message: `Do you want to proceed with deployment to ${chalk.cyan(projectData.displayName)} on ${chalk.cyan(project.targetEnvironment)} environment?`
|
|
1314
|
+
}
|
|
1315
|
+
]);
|
|
1316
|
+
if (!confirm) {
|
|
1317
|
+
process.exit(1);
|
|
1318
|
+
}
|
|
1319
|
+
}
|
|
1320
|
+
}
|
|
1212
1321
|
const buildId = await upload(ctx, project, token, maxSize);
|
|
1213
1322
|
if (!buildId) {
|
|
1214
1323
|
return;
|
|
1215
1324
|
}
|
|
1216
1325
|
try {
|
|
1326
|
+
ctx.logger.log(
|
|
1327
|
+
`🚀 Deploying project to ${chalk.cyan(project.targetEnvironment ?? `production`)} environment...`
|
|
1328
|
+
);
|
|
1217
1329
|
notificationService(`${apiConfig.apiBaseUrl}/notifications`, token, cliConfig2);
|
|
1218
1330
|
await buildLogsService(`${apiConfig.apiBaseUrl}/v1/logs/${buildId}`, token, cliConfig2);
|
|
1219
1331
|
ctx.logger.log(
|
|
@@ -1258,17 +1370,16 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1258
1370
|
process.exit(1);
|
|
1259
1371
|
});
|
|
1260
1372
|
};
|
|
1261
|
-
const command$
|
|
1262
|
-
return 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").action(() => runAction("deploy", action$
|
|
1373
|
+
const command$7 = ({ ctx }) => {
|
|
1374
|
+
return 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));
|
|
1263
1375
|
};
|
|
1264
1376
|
const deployProject = {
|
|
1265
1377
|
name: "deploy-project",
|
|
1266
1378
|
description: "Deploy a Strapi Cloud project",
|
|
1267
|
-
action: action$
|
|
1268
|
-
command: command$
|
|
1379
|
+
action: action$5,
|
|
1380
|
+
command: command$7
|
|
1269
1381
|
};
|
|
1270
|
-
|
|
1271
|
-
async function getExistingConfig(ctx) {
|
|
1382
|
+
async function getLocalConfig(ctx) {
|
|
1272
1383
|
try {
|
|
1273
1384
|
return await retrieve();
|
|
1274
1385
|
} catch (e) {
|
|
@@ -1277,6 +1388,21 @@ async function getExistingConfig(ctx) {
|
|
|
1277
1388
|
return null;
|
|
1278
1389
|
}
|
|
1279
1390
|
}
|
|
1391
|
+
async function getLocalProject(ctx) {
|
|
1392
|
+
const localConfig = await getLocalConfig(ctx);
|
|
1393
|
+
if (!localConfig || !localConfig.project) {
|
|
1394
|
+
ctx.logger.warn(
|
|
1395
|
+
`
|
|
1396
|
+
We couldn't find a valid local project config.
|
|
1397
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1398
|
+
"link"
|
|
1399
|
+
)} command.`
|
|
1400
|
+
);
|
|
1401
|
+
process.exit(1);
|
|
1402
|
+
}
|
|
1403
|
+
return localConfig.project;
|
|
1404
|
+
}
|
|
1405
|
+
const QUIT_OPTION$1 = "Quit";
|
|
1280
1406
|
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1281
1407
|
if (existingConfig && existingConfig.project) {
|
|
1282
1408
|
const { shouldRelink } = await inquirer.prompt([
|
|
@@ -1306,7 +1432,7 @@ async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
|
1306
1432
|
} = await cloudApiService.listLinkProjects();
|
|
1307
1433
|
spinner.succeed();
|
|
1308
1434
|
if (!Array.isArray(projectList)) {
|
|
1309
|
-
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1435
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1310
1436
|
return null;
|
|
1311
1437
|
}
|
|
1312
1438
|
const projects = projectList.filter(
|
|
@@ -1318,7 +1444,7 @@ async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
|
1318
1444
|
};
|
|
1319
1445
|
});
|
|
1320
1446
|
if (projects.length === 0) {
|
|
1321
|
-
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1447
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1322
1448
|
return null;
|
|
1323
1449
|
}
|
|
1324
1450
|
return projects;
|
|
@@ -1336,7 +1462,7 @@ async function getUserSelection(ctx, projects) {
|
|
|
1336
1462
|
type: "list",
|
|
1337
1463
|
name: "linkProject",
|
|
1338
1464
|
message: "Which project do you want to link?",
|
|
1339
|
-
choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1465
|
+
choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION$1})`), value: null }]
|
|
1340
1466
|
}
|
|
1341
1467
|
]);
|
|
1342
1468
|
if (!answer.linkProject) {
|
|
@@ -1349,7 +1475,7 @@ async function getUserSelection(ctx, projects) {
|
|
|
1349
1475
|
return null;
|
|
1350
1476
|
}
|
|
1351
1477
|
}
|
|
1352
|
-
const action$
|
|
1478
|
+
const action$4 = async (ctx) => {
|
|
1353
1479
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1354
1480
|
const token = await getValidToken(ctx, promptLogin);
|
|
1355
1481
|
const { logger } = ctx;
|
|
@@ -1357,7 +1483,7 @@ const action$3 = async (ctx) => {
|
|
|
1357
1483
|
return;
|
|
1358
1484
|
}
|
|
1359
1485
|
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1360
|
-
const existingConfig = await
|
|
1486
|
+
const existingConfig = await getLocalConfig(ctx);
|
|
1361
1487
|
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1362
1488
|
if (!shouldRelink) {
|
|
1363
1489
|
return;
|
|
@@ -1392,7 +1518,9 @@ const action$3 = async (ctx) => {
|
|
|
1392
1518
|
return;
|
|
1393
1519
|
}
|
|
1394
1520
|
await save({ project: answer.linkProject });
|
|
1395
|
-
logger.log(
|
|
1521
|
+
logger.log(
|
|
1522
|
+
` You have successfully linked your project to ${chalk.cyan(answer.linkProject.displayName)}. You are now able to deploy your project.`
|
|
1523
|
+
);
|
|
1396
1524
|
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1397
1525
|
projectInternalName: answer.linkProject
|
|
1398
1526
|
});
|
|
@@ -1404,16 +1532,16 @@ const action$3 = async (ctx) => {
|
|
|
1404
1532
|
});
|
|
1405
1533
|
}
|
|
1406
1534
|
};
|
|
1407
|
-
const command$
|
|
1408
|
-
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$
|
|
1535
|
+
const command$6 = ({ command: command2, ctx }) => {
|
|
1536
|
+
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));
|
|
1409
1537
|
};
|
|
1410
1538
|
const link = {
|
|
1411
1539
|
name: "link-project",
|
|
1412
1540
|
description: "Link a local directory to a Strapi Cloud project",
|
|
1413
|
-
action: action$
|
|
1414
|
-
command: command$
|
|
1541
|
+
action: action$4,
|
|
1542
|
+
command: command$6
|
|
1415
1543
|
};
|
|
1416
|
-
const command$
|
|
1544
|
+
const command$5 = ({ ctx }) => {
|
|
1417
1545
|
return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1418
1546
|
"after",
|
|
1419
1547
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
@@ -1423,10 +1551,10 @@ const login = {
|
|
|
1423
1551
|
name: "login",
|
|
1424
1552
|
description: "Strapi Cloud Login",
|
|
1425
1553
|
action: loginAction,
|
|
1426
|
-
command: command$
|
|
1554
|
+
command: command$5
|
|
1427
1555
|
};
|
|
1428
1556
|
const openModule = import("open");
|
|
1429
|
-
const action$
|
|
1557
|
+
const action$3 = async (ctx) => {
|
|
1430
1558
|
const { logger } = ctx;
|
|
1431
1559
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1432
1560
|
const token = await retrieveToken();
|
|
@@ -1458,25 +1586,25 @@ const action$2 = async (ctx) => {
|
|
|
1458
1586
|
}
|
|
1459
1587
|
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1460
1588
|
};
|
|
1461
|
-
const command$
|
|
1462
|
-
return 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$
|
|
1589
|
+
const command$4 = ({ ctx }) => {
|
|
1590
|
+
return 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));
|
|
1463
1591
|
};
|
|
1464
1592
|
const logout = {
|
|
1465
1593
|
name: "logout",
|
|
1466
1594
|
description: "Strapi Cloud Logout",
|
|
1467
|
-
action: action$
|
|
1468
|
-
command: command$
|
|
1595
|
+
action: action$3,
|
|
1596
|
+
command: command$4
|
|
1469
1597
|
};
|
|
1470
|
-
const command$
|
|
1471
|
-
return 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$
|
|
1598
|
+
const command$3 = ({ ctx }) => {
|
|
1599
|
+
return 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));
|
|
1472
1600
|
};
|
|
1473
1601
|
const createProject = {
|
|
1474
1602
|
name: "create-project",
|
|
1475
1603
|
description: "Create a new project",
|
|
1476
|
-
action: action$
|
|
1477
|
-
command: command$
|
|
1604
|
+
action: action$6,
|
|
1605
|
+
command: command$3
|
|
1478
1606
|
};
|
|
1479
|
-
const action$
|
|
1607
|
+
const action$2 = async (ctx) => {
|
|
1480
1608
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1481
1609
|
const token = await getValidToken(ctx, promptLogin);
|
|
1482
1610
|
const { logger } = ctx;
|
|
@@ -1496,37 +1624,23 @@ const action$1 = async (ctx) => {
|
|
|
1496
1624
|
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1497
1625
|
}
|
|
1498
1626
|
};
|
|
1499
|
-
const command$
|
|
1500
|
-
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$
|
|
1627
|
+
const command$2 = ({ command: command2, ctx }) => {
|
|
1628
|
+
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));
|
|
1501
1629
|
};
|
|
1502
1630
|
const listProjects = {
|
|
1503
1631
|
name: "list-projects",
|
|
1504
1632
|
description: "List Strapi Cloud projects",
|
|
1505
|
-
action: action$
|
|
1506
|
-
command: command$
|
|
1633
|
+
action: action$2,
|
|
1634
|
+
command: command$2
|
|
1507
1635
|
};
|
|
1508
|
-
async
|
|
1509
|
-
const { project } = await retrieve();
|
|
1510
|
-
if (!project) {
|
|
1511
|
-
ctx.logger.warn(
|
|
1512
|
-
`
|
|
1513
|
-
We couldn't find a valid local project config.
|
|
1514
|
-
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1515
|
-
"link"
|
|
1516
|
-
)} command`
|
|
1517
|
-
);
|
|
1518
|
-
process.exit(1);
|
|
1519
|
-
}
|
|
1520
|
-
return project;
|
|
1521
|
-
}
|
|
1522
|
-
const action = async (ctx) => {
|
|
1636
|
+
const action$1 = async (ctx) => {
|
|
1523
1637
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1524
1638
|
const token = await getValidToken(ctx, promptLogin);
|
|
1525
1639
|
const { logger } = ctx;
|
|
1526
1640
|
if (!token) {
|
|
1527
1641
|
return;
|
|
1528
1642
|
}
|
|
1529
|
-
const project = await
|
|
1643
|
+
const project = await getLocalProject(ctx);
|
|
1530
1644
|
if (!project) {
|
|
1531
1645
|
ctx.logger.debug(`No valid local project configuration was found.`);
|
|
1532
1646
|
return;
|
|
@@ -1564,18 +1678,140 @@ Please link your local project to an existing Strapi Cloud project using the ${c
|
|
|
1564
1678
|
});
|
|
1565
1679
|
}
|
|
1566
1680
|
};
|
|
1567
|
-
function defineCloudNamespace(command2) {
|
|
1568
|
-
|
|
1681
|
+
function defineCloudNamespace(command2, ctx) {
|
|
1682
|
+
const cloud = command2.command("cloud").description("Manage Strapi Cloud projects");
|
|
1683
|
+
cloud.command("environments").description("Alias for cloud environment list").action(() => runAction("list", action$1)(ctx));
|
|
1684
|
+
return cloud;
|
|
1569
1685
|
}
|
|
1570
|
-
|
|
1571
|
-
|
|
1572
|
-
|
|
1573
|
-
|
|
1574
|
-
|
|
1686
|
+
let environmentCmd = null;
|
|
1687
|
+
const initializeEnvironmentCommand = (command2, ctx) => {
|
|
1688
|
+
if (!environmentCmd) {
|
|
1689
|
+
const cloud = defineCloudNamespace(command2, ctx);
|
|
1690
|
+
environmentCmd = cloud.command("environment").description("Manage environments");
|
|
1691
|
+
}
|
|
1692
|
+
return environmentCmd;
|
|
1693
|
+
};
|
|
1694
|
+
const command$1 = ({ command: command2, ctx }) => {
|
|
1695
|
+
const environmentCmd2 = initializeEnvironmentCommand(command2, ctx);
|
|
1696
|
+
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));
|
|
1575
1697
|
};
|
|
1576
1698
|
const listEnvironments = {
|
|
1577
1699
|
name: "list-environments",
|
|
1578
1700
|
description: "List Strapi Cloud environments",
|
|
1701
|
+
action: action$1,
|
|
1702
|
+
command: command$1
|
|
1703
|
+
};
|
|
1704
|
+
const QUIT_OPTION = "Quit";
|
|
1705
|
+
const action = async (ctx) => {
|
|
1706
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1707
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1708
|
+
const { logger } = ctx;
|
|
1709
|
+
if (!token) {
|
|
1710
|
+
return;
|
|
1711
|
+
}
|
|
1712
|
+
const project = await getLocalProject(ctx);
|
|
1713
|
+
if (!project) {
|
|
1714
|
+
logger.debug(`No valid local project configuration was found.`);
|
|
1715
|
+
return;
|
|
1716
|
+
}
|
|
1717
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1718
|
+
const environments = await getEnvironmentsList(ctx, cloudApiService, project);
|
|
1719
|
+
if (!environments) {
|
|
1720
|
+
logger.debug(`Fetching environments failed.`);
|
|
1721
|
+
return;
|
|
1722
|
+
}
|
|
1723
|
+
if (environments.length === 0) {
|
|
1724
|
+
logger.log(
|
|
1725
|
+
`The only available environment is already linked. You can add a new one from your project settings on the Strapi Cloud dashboard.`
|
|
1726
|
+
);
|
|
1727
|
+
return;
|
|
1728
|
+
}
|
|
1729
|
+
const answer = await promptUserForEnvironment(ctx, environments);
|
|
1730
|
+
if (!answer) {
|
|
1731
|
+
return;
|
|
1732
|
+
}
|
|
1733
|
+
await trackEvent(ctx, cloudApiService, "willLinkEnvironment", {
|
|
1734
|
+
projectName: project.name,
|
|
1735
|
+
environmentName: answer.targetEnvironment
|
|
1736
|
+
});
|
|
1737
|
+
try {
|
|
1738
|
+
await patch({ project: { targetEnvironment: answer.targetEnvironment } });
|
|
1739
|
+
} catch (e) {
|
|
1740
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkEnvironment", {
|
|
1741
|
+
projectName: project.name,
|
|
1742
|
+
environmentName: answer.targetEnvironment
|
|
1743
|
+
});
|
|
1744
|
+
logger.debug("Failed to link environment", e);
|
|
1745
|
+
logger.error(
|
|
1746
|
+
"Failed to link the environment. If this issue persists, try re-linking your project or contact support."
|
|
1747
|
+
);
|
|
1748
|
+
process.exit(1);
|
|
1749
|
+
}
|
|
1750
|
+
logger.log(
|
|
1751
|
+
` You have successfully linked your project to ${chalk.cyan(answer.targetEnvironment)}, on ${chalk.cyan(project.displayName)}. You are now able to deploy your project.`
|
|
1752
|
+
);
|
|
1753
|
+
await trackEvent(ctx, cloudApiService, "didLinkEnvironment", {
|
|
1754
|
+
projectName: project.name,
|
|
1755
|
+
environmentName: answer.targetEnvironment
|
|
1756
|
+
});
|
|
1757
|
+
};
|
|
1758
|
+
async function promptUserForEnvironment(ctx, environments) {
|
|
1759
|
+
const { logger } = ctx;
|
|
1760
|
+
try {
|
|
1761
|
+
const answer = await inquirer.prompt([
|
|
1762
|
+
{
|
|
1763
|
+
type: "list",
|
|
1764
|
+
name: "targetEnvironment",
|
|
1765
|
+
message: "Which environment do you want to link?",
|
|
1766
|
+
choices: [...environments, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1767
|
+
}
|
|
1768
|
+
]);
|
|
1769
|
+
if (!answer.targetEnvironment) {
|
|
1770
|
+
return null;
|
|
1771
|
+
}
|
|
1772
|
+
return answer;
|
|
1773
|
+
} catch (e) {
|
|
1774
|
+
logger.debug("Failed to get user input", e);
|
|
1775
|
+
logger.error("An error occurred while trying to get your environment selection.");
|
|
1776
|
+
return null;
|
|
1777
|
+
}
|
|
1778
|
+
}
|
|
1779
|
+
async function getEnvironmentsList(ctx, cloudApiService, project) {
|
|
1780
|
+
const spinner = ctx.logger.spinner("Fetching environments...\n").start();
|
|
1781
|
+
try {
|
|
1782
|
+
const {
|
|
1783
|
+
data: { data: environmentsList }
|
|
1784
|
+
} = await cloudApiService.listLinkEnvironments({ name: project.name });
|
|
1785
|
+
if (!Array.isArray(environmentsList) || environmentsList.length === 0) {
|
|
1786
|
+
throw new Error("Environments not found in server response");
|
|
1787
|
+
}
|
|
1788
|
+
spinner.succeed();
|
|
1789
|
+
return environmentsList.filter(
|
|
1790
|
+
(environment) => environment.name !== project.targetEnvironment
|
|
1791
|
+
);
|
|
1792
|
+
} catch (e) {
|
|
1793
|
+
if (e.response && e.response.status === 404) {
|
|
1794
|
+
spinner.succeed();
|
|
1795
|
+
ctx.logger.warn(
|
|
1796
|
+
`
|
|
1797
|
+
The project associated with this folder does not exist in Strapi Cloud.
|
|
1798
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1799
|
+
"link"
|
|
1800
|
+
)} command.`
|
|
1801
|
+
);
|
|
1802
|
+
} else {
|
|
1803
|
+
spinner.fail("An error occurred while fetching environments data from Strapi Cloud.");
|
|
1804
|
+
ctx.logger.debug("Failed to list environments", e);
|
|
1805
|
+
}
|
|
1806
|
+
}
|
|
1807
|
+
}
|
|
1808
|
+
const command = ({ command: command2, ctx }) => {
|
|
1809
|
+
const environmentCmd2 = initializeEnvironmentCommand(command2, ctx);
|
|
1810
|
+
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));
|
|
1811
|
+
};
|
|
1812
|
+
const linkEnvironment = {
|
|
1813
|
+
name: "link-environment",
|
|
1814
|
+
description: "Link Strapi Cloud environment to a local project",
|
|
1579
1815
|
action,
|
|
1580
1816
|
command
|
|
1581
1817
|
};
|
|
@@ -1585,12 +1821,21 @@ const cli = {
|
|
|
1585
1821
|
login,
|
|
1586
1822
|
logout,
|
|
1587
1823
|
createProject,
|
|
1824
|
+
linkEnvironment,
|
|
1588
1825
|
listProjects,
|
|
1589
1826
|
listEnvironments
|
|
1590
1827
|
};
|
|
1591
|
-
const cloudCommands = [
|
|
1828
|
+
const cloudCommands = [
|
|
1829
|
+
deployProject,
|
|
1830
|
+
link,
|
|
1831
|
+
login,
|
|
1832
|
+
logout,
|
|
1833
|
+
linkEnvironment,
|
|
1834
|
+
listProjects,
|
|
1835
|
+
listEnvironments
|
|
1836
|
+
];
|
|
1592
1837
|
async function initCloudCLIConfig() {
|
|
1593
|
-
const localConfig = await getLocalConfig();
|
|
1838
|
+
const localConfig = await getLocalConfig$1();
|
|
1594
1839
|
if (!localConfig.deviceId) {
|
|
1595
1840
|
localConfig.deviceId = crypto$1.randomUUID();
|
|
1596
1841
|
}
|