@strapi/cloud-cli 0.0.0-next.ae38a9dcdeddea4b4c0978686fb024413e5c54f5 → 0.0.0-next.af5da17207f828ea159182ea6e2d9a07ae6d34bf
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 +703 -129
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +700 -125
- package/dist/index.mjs.map +1 -1
- package/dist/src/cloud/command.d.ts +3 -0
- package/dist/src/cloud/command.d.ts.map +1 -0
- package/dist/src/create-project/action.d.ts.map +1 -1
- package/dist/src/create-project/command.d.ts.map +1 -1
- package/dist/src/create-project/utils/project-questions.utils.d.ts +20 -0
- package/dist/src/create-project/utils/project-questions.utils.d.ts.map +1 -0
- 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 +3 -0
- package/dist/src/environment/command.d.ts.map +1 -0
- 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 +4 -0
- package/dist/src/environment/list/action.d.ts.map +1 -0
- package/dist/src/environment/list/command.d.ts +4 -0
- package/dist/src/environment/list/command.d.ts.map +1 -0
- package/dist/src/environment/list/index.d.ts +7 -0
- package/dist/src/environment/list/index.d.ts.map +1 -0
- package/dist/src/index.d.ts +3 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/link/action.d.ts +4 -0
- package/dist/src/link/action.d.ts.map +1 -0
- package/dist/src/link/command.d.ts +7 -0
- package/dist/src/link/command.d.ts.map +1 -0
- package/dist/src/link/index.d.ts +7 -0
- package/dist/src/link/index.d.ts.map +1 -0
- package/dist/src/login/action.d.ts.map +1 -1
- package/dist/src/login/command.d.ts.map +1 -1
- package/dist/src/logout/action.d.ts.map +1 -1
- package/dist/src/logout/command.d.ts.map +1 -1
- package/dist/src/services/build-logs.d.ts.map +1 -1
- package/dist/src/services/cli-api.d.ts +58 -8
- 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 +8 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils/analytics.d.ts +4 -0
- package/dist/src/utils/analytics.d.ts.map +1 -0
- 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/dist/src/utils/tests/compress-files.test.d.ts +2 -0
- package/dist/src/utils/tests/compress-files.test.d.ts.map +1 -0
- package/package.json +11 -10
- package/dist/src/create-project/utils/apply-default-name.d.ts +0 -7
- package/dist/src/create-project/utils/apply-default-name.d.ts.map +0 -1
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";
|
|
@@ -20,8 +22,8 @@ import ora from "ora";
|
|
|
20
22
|
import * as cliProgress from "cli-progress";
|
|
21
23
|
import pkgUp from "pkg-up";
|
|
22
24
|
import * as yup from "yup";
|
|
23
|
-
import _ from "lodash";
|
|
24
25
|
import EventSource from "eventsource";
|
|
26
|
+
import { createCommand } from "commander";
|
|
25
27
|
const apiConfig = {
|
|
26
28
|
apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
|
|
27
29
|
dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
|
|
@@ -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 = "
|
|
138
|
+
const version = "5.5.0";
|
|
138
139
|
const description = "Commands to interact with the Strapi Cloud";
|
|
139
140
|
const keywords = [
|
|
140
141
|
"strapi",
|
|
@@ -179,14 +180,15 @@ const scripts = {
|
|
|
179
180
|
watch: "pack-up watch"
|
|
180
181
|
};
|
|
181
182
|
const dependencies = {
|
|
182
|
-
"@strapi/utils": "
|
|
183
|
-
axios: "1.
|
|
183
|
+
"@strapi/utils": "workspace:*",
|
|
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",
|
|
187
189
|
eventsource: "2.0.2",
|
|
188
190
|
"fast-safe-stringify": "2.1.1",
|
|
189
|
-
"fs-extra": "
|
|
191
|
+
"fs-extra": "11.2.0",
|
|
190
192
|
inquirer: "8.2.5",
|
|
191
193
|
jsonwebtoken: "9.0.0",
|
|
192
194
|
"jwks-rsa": "3.1.0",
|
|
@@ -195,22 +197,23 @@ const dependencies = {
|
|
|
195
197
|
open: "8.4.0",
|
|
196
198
|
ora: "5.4.1",
|
|
197
199
|
"pkg-up": "3.1.0",
|
|
198
|
-
tar: "6.1
|
|
200
|
+
tar: "6.2.1",
|
|
199
201
|
"xdg-app-paths": "8.3.0",
|
|
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": "workspace:*",
|
|
210
|
+
tsconfig: "workspace:*"
|
|
209
211
|
};
|
|
210
212
|
const engines = {
|
|
211
|
-
node: ">=18.0.0 <=
|
|
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"
|
|
@@ -315,6 +319,62 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
315
319
|
throw error;
|
|
316
320
|
}
|
|
317
321
|
},
|
|
322
|
+
async listLinkProjects() {
|
|
323
|
+
try {
|
|
324
|
+
const response = await axiosCloudAPI.get("/projects-linkable");
|
|
325
|
+
if (response.status !== 200) {
|
|
326
|
+
throw new Error("Error fetching cloud projects from the server.");
|
|
327
|
+
}
|
|
328
|
+
return response;
|
|
329
|
+
} catch (error) {
|
|
330
|
+
logger.debug(
|
|
331
|
+
"🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
|
|
332
|
+
);
|
|
333
|
+
throw error;
|
|
334
|
+
}
|
|
335
|
+
},
|
|
336
|
+
async listEnvironments({ name: name2 }) {
|
|
337
|
+
try {
|
|
338
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}/environments`);
|
|
339
|
+
if (response.status !== 200) {
|
|
340
|
+
throw new Error("Error fetching cloud environments from the server.");
|
|
341
|
+
}
|
|
342
|
+
return response;
|
|
343
|
+
} catch (error) {
|
|
344
|
+
logger.debug(
|
|
345
|
+
"🥲 Oops! Couldn't retrieve your project's environments from the server. Please try again."
|
|
346
|
+
);
|
|
347
|
+
throw error;
|
|
348
|
+
}
|
|
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
|
+
},
|
|
364
|
+
async getProject({ name: name2 }) {
|
|
365
|
+
try {
|
|
366
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
367
|
+
if (response.status !== 200) {
|
|
368
|
+
throw new Error("Error fetching project's details.");
|
|
369
|
+
}
|
|
370
|
+
return response;
|
|
371
|
+
} catch (error) {
|
|
372
|
+
logger.debug(
|
|
373
|
+
"🥲 Oops! There was a problem retrieving your project's details. Please try again."
|
|
374
|
+
);
|
|
375
|
+
throw error;
|
|
376
|
+
}
|
|
377
|
+
},
|
|
318
378
|
track(event, payload = {}) {
|
|
319
379
|
return axiosCloudAPI.post("/track", {
|
|
320
380
|
event,
|
|
@@ -324,26 +384,43 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
324
384
|
};
|
|
325
385
|
}
|
|
326
386
|
const LOCAL_SAVE_FILENAME = ".strapi-cloud.json";
|
|
387
|
+
const getFilePath = (directoryPath) => path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
327
388
|
async function save(data, { directoryPath } = {}) {
|
|
328
|
-
const
|
|
329
|
-
const storedData = { ...alreadyInFileData, ...data };
|
|
330
|
-
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
389
|
+
const pathToFile = getFilePath(directoryPath);
|
|
331
390
|
await fse__default.ensureDir(path__default.dirname(pathToFile));
|
|
332
|
-
await fse__default.writeJson(pathToFile,
|
|
391
|
+
await fse__default.writeJson(pathToFile, data, { encoding: "utf8" });
|
|
333
392
|
}
|
|
334
393
|
async function retrieve({
|
|
335
394
|
directoryPath
|
|
336
395
|
} = {}) {
|
|
337
|
-
const pathToFile =
|
|
396
|
+
const pathToFile = getFilePath(directoryPath);
|
|
338
397
|
const pathExists = await fse__default.pathExists(pathToFile);
|
|
339
398
|
if (!pathExists) {
|
|
340
399
|
return {};
|
|
341
400
|
}
|
|
342
401
|
return fse__default.readJSON(pathToFile, { encoding: "utf8" });
|
|
343
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
|
+
}
|
|
344
419
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
345
420
|
__proto__: null,
|
|
346
421
|
LOCAL_SAVE_FILENAME,
|
|
422
|
+
deleteConfig,
|
|
423
|
+
patch,
|
|
347
424
|
retrieve,
|
|
348
425
|
save
|
|
349
426
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
@@ -351,7 +428,7 @@ let cliConfig;
|
|
|
351
428
|
async function tokenServiceFactory({ logger }) {
|
|
352
429
|
const cloudApiService = await cloudApiFactory({ logger });
|
|
353
430
|
async function saveToken(str) {
|
|
354
|
-
const appConfig = await getLocalConfig();
|
|
431
|
+
const appConfig = await getLocalConfig$1();
|
|
355
432
|
if (!appConfig) {
|
|
356
433
|
logger.error("There was a problem saving your token. Please try again.");
|
|
357
434
|
return;
|
|
@@ -365,7 +442,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
365
442
|
}
|
|
366
443
|
}
|
|
367
444
|
async function retrieveToken() {
|
|
368
|
-
const appConfig = await getLocalConfig();
|
|
445
|
+
const appConfig = await getLocalConfig$1();
|
|
369
446
|
if (appConfig.token) {
|
|
370
447
|
if (await isTokenValid(appConfig.token)) {
|
|
371
448
|
return appConfig.token;
|
|
@@ -427,7 +504,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
427
504
|
}
|
|
428
505
|
}
|
|
429
506
|
async function eraseToken() {
|
|
430
|
-
const appConfig = await getLocalConfig();
|
|
507
|
+
const appConfig = await getLocalConfig$1();
|
|
431
508
|
if (!appConfig) {
|
|
432
509
|
return;
|
|
433
510
|
}
|
|
@@ -448,8 +525,7 @@ async function tokenServiceFactory({ logger }) {
|
|
|
448
525
|
logger.log(
|
|
449
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."
|
|
450
527
|
);
|
|
451
|
-
if (!await loginAction2(ctx))
|
|
452
|
-
return null;
|
|
528
|
+
if (!await loginAction2(ctx)) return null;
|
|
453
529
|
token = await retrieveToken();
|
|
454
530
|
}
|
|
455
531
|
return token;
|
|
@@ -588,21 +664,24 @@ yup.object({
|
|
|
588
664
|
name: yup.string().required(),
|
|
589
665
|
exports: yup.lazy(
|
|
590
666
|
(value) => yup.object(
|
|
591
|
-
typeof value === "object" ? Object.entries(value).reduce(
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
667
|
+
typeof value === "object" ? Object.entries(value).reduce(
|
|
668
|
+
(acc, [key, value2]) => {
|
|
669
|
+
if (typeof value2 === "object") {
|
|
670
|
+
acc[key] = yup.object({
|
|
671
|
+
types: yup.string().optional(),
|
|
672
|
+
source: yup.string().required(),
|
|
673
|
+
module: yup.string().optional(),
|
|
674
|
+
import: yup.string().required(),
|
|
675
|
+
require: yup.string().required(),
|
|
676
|
+
default: yup.string().required()
|
|
677
|
+
}).noUnknown(true);
|
|
678
|
+
} else {
|
|
679
|
+
acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
|
|
680
|
+
}
|
|
681
|
+
return acc;
|
|
682
|
+
},
|
|
683
|
+
{}
|
|
684
|
+
) : void 0
|
|
606
685
|
).optional()
|
|
607
686
|
)
|
|
608
687
|
});
|
|
@@ -624,18 +703,13 @@ async function getProjectNameFromPackageJson(ctx) {
|
|
|
624
703
|
return "my-strapi-project";
|
|
625
704
|
}
|
|
626
705
|
}
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
}
|
|
635
|
-
return questionCopy;
|
|
636
|
-
});
|
|
637
|
-
return { newQuestions, newDefaultValues };
|
|
638
|
-
}
|
|
706
|
+
const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
|
|
707
|
+
try {
|
|
708
|
+
await cloudApiService.track(eventName, eventData);
|
|
709
|
+
} catch (e) {
|
|
710
|
+
ctx.logger.debug(`Failed to track ${eventName}`, e);
|
|
711
|
+
}
|
|
712
|
+
};
|
|
639
713
|
const openModule$1 = import("open");
|
|
640
714
|
async function promptLogin(ctx) {
|
|
641
715
|
const response = await inquirer.prompt([
|
|
@@ -656,13 +730,6 @@ async function loginAction(ctx) {
|
|
|
656
730
|
const tokenService = await tokenServiceFactory(ctx);
|
|
657
731
|
const existingToken = await tokenService.retrieveToken();
|
|
658
732
|
const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
|
|
659
|
-
const trackFailedLogin = async () => {
|
|
660
|
-
try {
|
|
661
|
-
await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
|
|
662
|
-
} catch (e) {
|
|
663
|
-
logger.debug("Failed to track failed login", e);
|
|
664
|
-
}
|
|
665
|
-
};
|
|
666
733
|
if (existingToken) {
|
|
667
734
|
const isTokenValid = await tokenService.isTokenValid(existingToken);
|
|
668
735
|
if (isTokenValid) {
|
|
@@ -694,11 +761,7 @@ async function loginAction(ctx) {
|
|
|
694
761
|
logger.debug(e);
|
|
695
762
|
return false;
|
|
696
763
|
}
|
|
697
|
-
|
|
698
|
-
await cloudApiService.track("willLoginAttempt", {});
|
|
699
|
-
} catch (e) {
|
|
700
|
-
logger.debug("Failed to track login attempt", e);
|
|
701
|
-
}
|
|
764
|
+
await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
|
|
702
765
|
logger.debug("🔐 Creating device authentication request...", {
|
|
703
766
|
client_id: cliConfig2.clientId,
|
|
704
767
|
scope: cliConfig2.scope,
|
|
@@ -778,13 +841,13 @@ async function loginAction(ctx) {
|
|
|
778
841
|
"There seems to be a problem with your login information. Please try logging in again."
|
|
779
842
|
);
|
|
780
843
|
spinnerFail();
|
|
781
|
-
await
|
|
844
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
782
845
|
return false;
|
|
783
846
|
}
|
|
784
847
|
if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
|
|
785
848
|
logger.debug(e);
|
|
786
849
|
spinnerFail();
|
|
787
|
-
await
|
|
850
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
788
851
|
return false;
|
|
789
852
|
}
|
|
790
853
|
await new Promise((resolve) => {
|
|
@@ -798,15 +861,50 @@ async function loginAction(ctx) {
|
|
|
798
861
|
"To access your dashboard, please copy and paste the following URL into your web browser:"
|
|
799
862
|
);
|
|
800
863
|
logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
|
|
801
|
-
|
|
802
|
-
await cloudApiService.track("didLogin", { loginMethod: "cli" });
|
|
803
|
-
} catch (e) {
|
|
804
|
-
logger.debug("Failed to track login", e);
|
|
805
|
-
}
|
|
864
|
+
await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
|
|
806
865
|
};
|
|
807
866
|
await authenticate();
|
|
808
867
|
return isAuthenticated;
|
|
809
868
|
}
|
|
869
|
+
function questionDefaultValuesMapper(questionsMap) {
|
|
870
|
+
return (questions) => {
|
|
871
|
+
return questions.map((question) => {
|
|
872
|
+
const questionName = question.name;
|
|
873
|
+
if (questionName in questionsMap) {
|
|
874
|
+
const questionDefault = questionsMap[questionName];
|
|
875
|
+
if (typeof questionDefault === "function") {
|
|
876
|
+
return {
|
|
877
|
+
...question,
|
|
878
|
+
default: questionDefault(question)
|
|
879
|
+
};
|
|
880
|
+
}
|
|
881
|
+
return {
|
|
882
|
+
...question,
|
|
883
|
+
default: questionDefault
|
|
884
|
+
};
|
|
885
|
+
}
|
|
886
|
+
return question;
|
|
887
|
+
});
|
|
888
|
+
};
|
|
889
|
+
}
|
|
890
|
+
function getDefaultsFromQuestions(questions) {
|
|
891
|
+
return questions.reduce((acc, question) => {
|
|
892
|
+
if (question.default && question.name) {
|
|
893
|
+
return { ...acc, [question.name]: question.default };
|
|
894
|
+
}
|
|
895
|
+
return acc;
|
|
896
|
+
}, {});
|
|
897
|
+
}
|
|
898
|
+
function getProjectNodeVersionDefault(question) {
|
|
899
|
+
const currentNodeVersion = process.versions.node.split(".")[0];
|
|
900
|
+
if (question.type === "list" && Array.isArray(question.choices)) {
|
|
901
|
+
const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
|
|
902
|
+
if (choice) {
|
|
903
|
+
return choice.value;
|
|
904
|
+
}
|
|
905
|
+
}
|
|
906
|
+
return question.default;
|
|
907
|
+
}
|
|
810
908
|
async function handleError(ctx, error) {
|
|
811
909
|
const { logger } = ctx;
|
|
812
910
|
logger.debug(error);
|
|
@@ -851,7 +949,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
851
949
|
throw e;
|
|
852
950
|
}
|
|
853
951
|
}
|
|
854
|
-
const action$
|
|
952
|
+
const action$6 = async (ctx) => {
|
|
855
953
|
const { logger } = ctx;
|
|
856
954
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
857
955
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -860,11 +958,16 @@ const action$3 = async (ctx) => {
|
|
|
860
958
|
}
|
|
861
959
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
862
960
|
const { data: config } = await cloudApi.config();
|
|
863
|
-
const
|
|
864
|
-
|
|
865
|
-
|
|
866
|
-
|
|
867
|
-
);
|
|
961
|
+
const projectName = await getProjectNameFromPackageJson(ctx);
|
|
962
|
+
const defaultAnswersMapper = questionDefaultValuesMapper({
|
|
963
|
+
name: projectName,
|
|
964
|
+
nodeVersion: getProjectNodeVersionDefault
|
|
965
|
+
});
|
|
966
|
+
const questions = defaultAnswersMapper(config.projectCreation.questions);
|
|
967
|
+
const defaultValues = {
|
|
968
|
+
...config.projectCreation.defaults,
|
|
969
|
+
...getDefaultsFromQuestions(questions)
|
|
970
|
+
};
|
|
868
971
|
const projectAnswersDefaulted = defaults(defaultValues);
|
|
869
972
|
const projectAnswers = await inquirer.prompt(questions);
|
|
870
973
|
const projectInput = projectAnswersDefaulted(projectAnswers);
|
|
@@ -966,6 +1069,7 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
966
1069
|
if (retries > MAX_RETRIES) {
|
|
967
1070
|
spinner.fail("We were unable to connect to the server to get build logs at this time.");
|
|
968
1071
|
es.close();
|
|
1072
|
+
clearExistingTimeout();
|
|
969
1073
|
reject(new Error("Max retries reached"));
|
|
970
1074
|
}
|
|
971
1075
|
};
|
|
@@ -974,6 +1078,29 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
974
1078
|
});
|
|
975
1079
|
};
|
|
976
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
|
+
}
|
|
977
1104
|
async function upload(ctx, project, token, maxProjectFileSize) {
|
|
978
1105
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
979
1106
|
try {
|
|
@@ -1040,17 +1167,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1040
1167
|
return data.build_id;
|
|
1041
1168
|
} catch (e) {
|
|
1042
1169
|
progressBar.stop();
|
|
1043
|
-
|
|
1044
|
-
if (e.response.status === 404) {
|
|
1045
|
-
ctx.logger.error(
|
|
1046
|
-
`The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
|
|
1047
|
-
);
|
|
1048
|
-
} else {
|
|
1049
|
-
ctx.logger.error(e.response.data);
|
|
1050
|
-
}
|
|
1051
|
-
} else {
|
|
1052
|
-
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1053
|
-
}
|
|
1170
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1054
1171
|
ctx.logger.debug(e);
|
|
1055
1172
|
} finally {
|
|
1056
1173
|
await fse__default.remove(tarFilePath);
|
|
@@ -1066,7 +1183,7 @@ async function getProject(ctx) {
|
|
|
1066
1183
|
const { project } = await retrieve();
|
|
1067
1184
|
if (!project) {
|
|
1068
1185
|
try {
|
|
1069
|
-
return await action$
|
|
1186
|
+
return await action$6(ctx);
|
|
1070
1187
|
} catch (e) {
|
|
1071
1188
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1072
1189
|
ctx.logger.debug(e);
|
|
@@ -1075,7 +1192,45 @@ async function getProject(ctx) {
|
|
|
1075
1192
|
}
|
|
1076
1193
|
return project;
|
|
1077
1194
|
}
|
|
1078
|
-
|
|
1195
|
+
async function getConfig({
|
|
1196
|
+
ctx,
|
|
1197
|
+
cloudApiService
|
|
1198
|
+
}) {
|
|
1199
|
+
try {
|
|
1200
|
+
const { data: cliConfig2 } = await cloudApiService.config();
|
|
1201
|
+
return cliConfig2;
|
|
1202
|
+
} catch (e) {
|
|
1203
|
+
ctx.logger.debug("Failed to get cli config", e);
|
|
1204
|
+
return null;
|
|
1205
|
+
}
|
|
1206
|
+
}
|
|
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) => {
|
|
1079
1234
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1080
1235
|
const token = await getValidToken(ctx, promptLogin);
|
|
1081
1236
|
if (!token) {
|
|
@@ -1085,15 +1240,57 @@ const action$2 = async (ctx) => {
|
|
|
1085
1240
|
if (!project) {
|
|
1086
1241
|
return;
|
|
1087
1242
|
}
|
|
1088
|
-
const cloudApiService = await cloudApiFactory(ctx);
|
|
1243
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1244
|
+
let projectData;
|
|
1245
|
+
let environments;
|
|
1246
|
+
let environmentsDetails;
|
|
1089
1247
|
try {
|
|
1090
|
-
|
|
1248
|
+
const {
|
|
1249
|
+
data: { data, metadata }
|
|
1250
|
+
} = await cloudApiService.getProject({ name: project.name });
|
|
1251
|
+
projectData = data;
|
|
1252
|
+
environments = projectData.environments;
|
|
1253
|
+
environmentsDetails = projectData.environmentsDetails;
|
|
1254
|
+
const isProjectSuspended = projectData.suspendedAt;
|
|
1255
|
+
if (isProjectSuspended) {
|
|
1256
|
+
ctx.logger.log(
|
|
1257
|
+
"\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
|
|
1258
|
+
);
|
|
1259
|
+
ctx.logger.log(chalk.underline(`${metadata.dashboardUrls.project}`));
|
|
1260
|
+
return;
|
|
1261
|
+
}
|
|
1091
1262
|
} catch (e) {
|
|
1092
|
-
|
|
1263
|
+
if (e instanceof AxiosError && e.response?.data) {
|
|
1264
|
+
if (e.response.status === 404) {
|
|
1265
|
+
ctx.logger.warn(
|
|
1266
|
+
`The project associated with this folder does not exist in Strapi Cloud.
|
|
1267
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1268
|
+
"link"
|
|
1269
|
+
)} command before deploying.`
|
|
1270
|
+
);
|
|
1271
|
+
} else {
|
|
1272
|
+
ctx.logger.error(e.response.data);
|
|
1273
|
+
}
|
|
1274
|
+
} else {
|
|
1275
|
+
ctx.logger.error(
|
|
1276
|
+
"An error occurred while retrieving the project's information. Please try again later."
|
|
1277
|
+
);
|
|
1278
|
+
}
|
|
1279
|
+
ctx.logger.debug(e);
|
|
1280
|
+
return;
|
|
1093
1281
|
}
|
|
1282
|
+
await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
|
|
1283
|
+
projectInternalName: project.name
|
|
1284
|
+
});
|
|
1094
1285
|
const notificationService = notificationServiceFactory(ctx);
|
|
1095
1286
|
const buildLogsService = buildLogsServiceFactory(ctx);
|
|
1096
|
-
const
|
|
1287
|
+
const cliConfig2 = await getConfig({ ctx, cloudApiService });
|
|
1288
|
+
if (!cliConfig2) {
|
|
1289
|
+
ctx.logger.error(
|
|
1290
|
+
"An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
|
|
1291
|
+
);
|
|
1292
|
+
return;
|
|
1293
|
+
}
|
|
1097
1294
|
let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
|
|
1098
1295
|
if (Number.isNaN(maxSize)) {
|
|
1099
1296
|
ctx.logger.debug(
|
|
@@ -1101,11 +1298,34 @@ const action$2 = async (ctx) => {
|
|
|
1101
1298
|
);
|
|
1102
1299
|
maxSize = 1e8;
|
|
1103
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
|
+
}
|
|
1104
1321
|
const buildId = await upload(ctx, project, token, maxSize);
|
|
1105
1322
|
if (!buildId) {
|
|
1106
1323
|
return;
|
|
1107
1324
|
}
|
|
1108
1325
|
try {
|
|
1326
|
+
ctx.logger.log(
|
|
1327
|
+
`🚀 Deploying project to ${chalk.cyan(project.targetEnvironment ?? `production`)} environment...`
|
|
1328
|
+
);
|
|
1109
1329
|
notificationService(`${apiConfig.apiBaseUrl}/notifications`, token, cliConfig2);
|
|
1110
1330
|
await buildLogsService(`${apiConfig.apiBaseUrl}/v1/logs/${buildId}`, token, cliConfig2);
|
|
1111
1331
|
ctx.logger.log(
|
|
@@ -1115,10 +1335,11 @@ const action$2 = async (ctx) => {
|
|
|
1115
1335
|
chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
|
|
1116
1336
|
);
|
|
1117
1337
|
} catch (e) {
|
|
1338
|
+
ctx.logger.debug(e);
|
|
1118
1339
|
if (e instanceof Error) {
|
|
1119
1340
|
ctx.logger.error(e.message);
|
|
1120
1341
|
} else {
|
|
1121
|
-
|
|
1342
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1122
1343
|
}
|
|
1123
1344
|
}
|
|
1124
1345
|
};
|
|
@@ -1149,17 +1370,179 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1149
1370
|
process.exit(1);
|
|
1150
1371
|
});
|
|
1151
1372
|
};
|
|
1152
|
-
const command$
|
|
1153
|
-
|
|
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));
|
|
1154
1375
|
};
|
|
1155
1376
|
const deployProject = {
|
|
1156
1377
|
name: "deploy-project",
|
|
1157
1378
|
description: "Deploy a Strapi Cloud project",
|
|
1158
|
-
action: action$
|
|
1159
|
-
command: command$
|
|
1379
|
+
action: action$5,
|
|
1380
|
+
command: command$7
|
|
1381
|
+
};
|
|
1382
|
+
async function getLocalConfig(ctx) {
|
|
1383
|
+
try {
|
|
1384
|
+
return await retrieve();
|
|
1385
|
+
} catch (e) {
|
|
1386
|
+
ctx.logger.debug("Failed to get project config", e);
|
|
1387
|
+
ctx.logger.error("An error occurred while retrieving config data from your local project.");
|
|
1388
|
+
return null;
|
|
1389
|
+
}
|
|
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";
|
|
1406
|
+
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1407
|
+
if (existingConfig && existingConfig.project) {
|
|
1408
|
+
const { shouldRelink } = await inquirer.prompt([
|
|
1409
|
+
{
|
|
1410
|
+
type: "confirm",
|
|
1411
|
+
name: "shouldRelink",
|
|
1412
|
+
message: `A project named ${chalk.cyan(
|
|
1413
|
+
existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
|
|
1414
|
+
)} is already linked to this local folder. Do you want to update the link?`,
|
|
1415
|
+
default: false
|
|
1416
|
+
}
|
|
1417
|
+
]);
|
|
1418
|
+
if (!shouldRelink) {
|
|
1419
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1420
|
+
currentProjectName: existingConfig.project?.name
|
|
1421
|
+
});
|
|
1422
|
+
return false;
|
|
1423
|
+
}
|
|
1424
|
+
}
|
|
1425
|
+
return true;
|
|
1426
|
+
}
|
|
1427
|
+
async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
1428
|
+
const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
|
|
1429
|
+
try {
|
|
1430
|
+
const {
|
|
1431
|
+
data: { data: projectList }
|
|
1432
|
+
} = await cloudApiService.listLinkProjects();
|
|
1433
|
+
spinner.succeed();
|
|
1434
|
+
if (!Array.isArray(projectList)) {
|
|
1435
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1436
|
+
return null;
|
|
1437
|
+
}
|
|
1438
|
+
const projects = projectList.filter(
|
|
1439
|
+
(project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
|
|
1440
|
+
).map((project) => {
|
|
1441
|
+
return {
|
|
1442
|
+
name: project.displayName,
|
|
1443
|
+
value: { name: project.name, displayName: project.displayName }
|
|
1444
|
+
};
|
|
1445
|
+
});
|
|
1446
|
+
if (projects.length === 0) {
|
|
1447
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud.");
|
|
1448
|
+
return null;
|
|
1449
|
+
}
|
|
1450
|
+
return projects;
|
|
1451
|
+
} catch (e) {
|
|
1452
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1453
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1454
|
+
return null;
|
|
1455
|
+
}
|
|
1456
|
+
}
|
|
1457
|
+
async function getUserSelection(ctx, projects) {
|
|
1458
|
+
const { logger } = ctx;
|
|
1459
|
+
try {
|
|
1460
|
+
const answer = await inquirer.prompt([
|
|
1461
|
+
{
|
|
1462
|
+
type: "list",
|
|
1463
|
+
name: "linkProject",
|
|
1464
|
+
message: "Which project do you want to link?",
|
|
1465
|
+
choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION$1})`), value: null }]
|
|
1466
|
+
}
|
|
1467
|
+
]);
|
|
1468
|
+
if (!answer.linkProject) {
|
|
1469
|
+
return null;
|
|
1470
|
+
}
|
|
1471
|
+
return answer;
|
|
1472
|
+
} catch (e) {
|
|
1473
|
+
logger.debug("Failed to get user input", e);
|
|
1474
|
+
logger.error("An error occurred while trying to get your input.");
|
|
1475
|
+
return null;
|
|
1476
|
+
}
|
|
1477
|
+
}
|
|
1478
|
+
const action$4 = async (ctx) => {
|
|
1479
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1480
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1481
|
+
const { logger } = ctx;
|
|
1482
|
+
if (!token) {
|
|
1483
|
+
return;
|
|
1484
|
+
}
|
|
1485
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1486
|
+
const existingConfig = await getLocalConfig(ctx);
|
|
1487
|
+
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1488
|
+
if (!shouldRelink) {
|
|
1489
|
+
return;
|
|
1490
|
+
}
|
|
1491
|
+
await trackEvent(ctx, cloudApiService, "willLinkProject", {});
|
|
1492
|
+
const projects = await getProjectsList(
|
|
1493
|
+
ctx,
|
|
1494
|
+
cloudApiService,
|
|
1495
|
+
existingConfig
|
|
1496
|
+
);
|
|
1497
|
+
if (!projects) {
|
|
1498
|
+
return;
|
|
1499
|
+
}
|
|
1500
|
+
const answer = await getUserSelection(ctx, projects);
|
|
1501
|
+
if (!answer) {
|
|
1502
|
+
return;
|
|
1503
|
+
}
|
|
1504
|
+
try {
|
|
1505
|
+
const { confirmAction } = await inquirer.prompt([
|
|
1506
|
+
{
|
|
1507
|
+
type: "confirm",
|
|
1508
|
+
name: "confirmAction",
|
|
1509
|
+
message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
|
|
1510
|
+
default: false
|
|
1511
|
+
}
|
|
1512
|
+
]);
|
|
1513
|
+
if (!confirmAction) {
|
|
1514
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1515
|
+
cancelledProjectName: answer.linkProject.name,
|
|
1516
|
+
currentProjectName: existingConfig ? existingConfig.project?.name : null
|
|
1517
|
+
});
|
|
1518
|
+
return;
|
|
1519
|
+
}
|
|
1520
|
+
await save({ project: answer.linkProject });
|
|
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
|
+
);
|
|
1524
|
+
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1525
|
+
projectInternalName: answer.linkProject
|
|
1526
|
+
});
|
|
1527
|
+
} catch (e) {
|
|
1528
|
+
logger.debug("Failed to link project", e);
|
|
1529
|
+
logger.error("An error occurred while linking the project.");
|
|
1530
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1531
|
+
projectInternalName: answer.linkProject
|
|
1532
|
+
});
|
|
1533
|
+
}
|
|
1534
|
+
};
|
|
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));
|
|
1160
1537
|
};
|
|
1161
|
-
const
|
|
1162
|
-
|
|
1538
|
+
const link = {
|
|
1539
|
+
name: "link-project",
|
|
1540
|
+
description: "Link a local directory to a Strapi Cloud project",
|
|
1541
|
+
action: action$4,
|
|
1542
|
+
command: command$6
|
|
1543
|
+
};
|
|
1544
|
+
const command$5 = ({ ctx }) => {
|
|
1545
|
+
return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1163
1546
|
"after",
|
|
1164
1547
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
1165
1548
|
).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
|
|
@@ -1168,10 +1551,10 @@ const login = {
|
|
|
1168
1551
|
name: "login",
|
|
1169
1552
|
description: "Strapi Cloud Login",
|
|
1170
1553
|
action: loginAction,
|
|
1171
|
-
command: command$
|
|
1554
|
+
command: command$5
|
|
1172
1555
|
};
|
|
1173
1556
|
const openModule = import("open");
|
|
1174
|
-
const action$
|
|
1557
|
+
const action$3 = async (ctx) => {
|
|
1175
1558
|
const { logger } = ctx;
|
|
1176
1559
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1177
1560
|
const token = await retrieveToken();
|
|
@@ -1201,31 +1584,27 @@ const action$1 = async (ctx) => {
|
|
|
1201
1584
|
logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
|
|
1202
1585
|
logger.debug(e);
|
|
1203
1586
|
}
|
|
1204
|
-
|
|
1205
|
-
await cloudApiService.track("didLogout", { loginMethod: "cli" });
|
|
1206
|
-
} catch (e) {
|
|
1207
|
-
logger.debug("Failed to track logout event", e);
|
|
1208
|
-
}
|
|
1587
|
+
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1209
1588
|
};
|
|
1210
|
-
const command$
|
|
1211
|
-
|
|
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));
|
|
1212
1591
|
};
|
|
1213
1592
|
const logout = {
|
|
1214
1593
|
name: "logout",
|
|
1215
1594
|
description: "Strapi Cloud Logout",
|
|
1216
|
-
action: action$
|
|
1217
|
-
command: command$
|
|
1595
|
+
action: action$3,
|
|
1596
|
+
command: command$4
|
|
1218
1597
|
};
|
|
1219
|
-
const command$
|
|
1220
|
-
|
|
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));
|
|
1221
1600
|
};
|
|
1222
1601
|
const createProject = {
|
|
1223
1602
|
name: "create-project",
|
|
1224
1603
|
description: "Create a new project",
|
|
1225
|
-
action: action$
|
|
1226
|
-
command: command$
|
|
1604
|
+
action: action$6,
|
|
1605
|
+
command: command$3
|
|
1227
1606
|
};
|
|
1228
|
-
const action = async (ctx) => {
|
|
1607
|
+
const action$2 = async (ctx) => {
|
|
1229
1608
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1230
1609
|
const token = await getValidToken(ctx, promptLogin);
|
|
1231
1610
|
const { logger } = ctx;
|
|
@@ -1245,25 +1624,218 @@ const action = async (ctx) => {
|
|
|
1245
1624
|
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1246
1625
|
}
|
|
1247
1626
|
};
|
|
1248
|
-
const command = ({ command: command2, ctx }) => {
|
|
1249
|
-
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("
|
|
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));
|
|
1250
1629
|
};
|
|
1251
1630
|
const listProjects = {
|
|
1252
1631
|
name: "list-projects",
|
|
1253
1632
|
description: "List Strapi Cloud projects",
|
|
1633
|
+
action: action$2,
|
|
1634
|
+
command: command$2
|
|
1635
|
+
};
|
|
1636
|
+
const action$1 = async (ctx) => {
|
|
1637
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1638
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1639
|
+
const { logger } = ctx;
|
|
1640
|
+
if (!token) {
|
|
1641
|
+
return;
|
|
1642
|
+
}
|
|
1643
|
+
const project = await getLocalProject(ctx);
|
|
1644
|
+
if (!project) {
|
|
1645
|
+
ctx.logger.debug(`No valid local project configuration was found.`);
|
|
1646
|
+
return;
|
|
1647
|
+
}
|
|
1648
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1649
|
+
const spinner = logger.spinner("Fetching environments...").start();
|
|
1650
|
+
await trackEvent(ctx, cloudApiService, "willListEnvironment", {
|
|
1651
|
+
projectInternalName: project.name
|
|
1652
|
+
});
|
|
1653
|
+
try {
|
|
1654
|
+
const {
|
|
1655
|
+
data: { data: environmentsList }
|
|
1656
|
+
} = await cloudApiService.listEnvironments({ name: project.name });
|
|
1657
|
+
spinner.succeed();
|
|
1658
|
+
logger.log(environmentsList);
|
|
1659
|
+
await trackEvent(ctx, cloudApiService, "didListEnvironment", {
|
|
1660
|
+
projectInternalName: project.name
|
|
1661
|
+
});
|
|
1662
|
+
} catch (e) {
|
|
1663
|
+
if (e.response && e.response.status === 404) {
|
|
1664
|
+
spinner.succeed();
|
|
1665
|
+
logger.warn(
|
|
1666
|
+
`
|
|
1667
|
+
The project associated with this folder does not exist in Strapi Cloud.
|
|
1668
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1669
|
+
"link"
|
|
1670
|
+
)} command`
|
|
1671
|
+
);
|
|
1672
|
+
} else {
|
|
1673
|
+
spinner.fail("An error occurred while fetching environments data from Strapi Cloud.");
|
|
1674
|
+
logger.debug("Failed to list environments", e);
|
|
1675
|
+
}
|
|
1676
|
+
await trackEvent(ctx, cloudApiService, "didNotListEnvironment", {
|
|
1677
|
+
projectInternalName: project.name
|
|
1678
|
+
});
|
|
1679
|
+
}
|
|
1680
|
+
};
|
|
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;
|
|
1685
|
+
}
|
|
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));
|
|
1697
|
+
};
|
|
1698
|
+
const listEnvironments = {
|
|
1699
|
+
name: "list-environments",
|
|
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",
|
|
1254
1815
|
action,
|
|
1255
1816
|
command
|
|
1256
1817
|
};
|
|
1257
1818
|
const cli = {
|
|
1258
1819
|
deployProject,
|
|
1820
|
+
link,
|
|
1259
1821
|
login,
|
|
1260
1822
|
logout,
|
|
1261
1823
|
createProject,
|
|
1262
|
-
|
|
1824
|
+
linkEnvironment,
|
|
1825
|
+
listProjects,
|
|
1826
|
+
listEnvironments
|
|
1263
1827
|
};
|
|
1264
|
-
const cloudCommands = [
|
|
1828
|
+
const cloudCommands = [
|
|
1829
|
+
deployProject,
|
|
1830
|
+
link,
|
|
1831
|
+
login,
|
|
1832
|
+
logout,
|
|
1833
|
+
linkEnvironment,
|
|
1834
|
+
listProjects,
|
|
1835
|
+
listEnvironments
|
|
1836
|
+
];
|
|
1265
1837
|
async function initCloudCLIConfig() {
|
|
1266
|
-
const localConfig = await getLocalConfig();
|
|
1838
|
+
const localConfig = await getLocalConfig$1();
|
|
1267
1839
|
if (!localConfig.deviceId) {
|
|
1268
1840
|
localConfig.deviceId = crypto$1.randomUUID();
|
|
1269
1841
|
}
|
|
@@ -1277,7 +1849,10 @@ async function buildStrapiCloudCommands({
|
|
|
1277
1849
|
await initCloudCLIConfig();
|
|
1278
1850
|
for (const cloudCommand of cloudCommands) {
|
|
1279
1851
|
try {
|
|
1280
|
-
await cloudCommand.command({ command: command2, ctx, argv });
|
|
1852
|
+
const subCommand = await cloudCommand.command({ command: command2, ctx, argv });
|
|
1853
|
+
if (subCommand) {
|
|
1854
|
+
command2.addCommand(subCommand);
|
|
1855
|
+
}
|
|
1281
1856
|
} catch (e) {
|
|
1282
1857
|
console.error(`Failed to load command ${cloudCommand.name}`, e);
|
|
1283
1858
|
}
|