@catladder/cli 3.38.0 → 3.39.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,16 +23,27 @@ exports.default = async (vorpal) => vorpal
23
23
  const allContexts = await (0, getProjectConfig_1.getAllPipelineContexts)(undefined, {
24
24
  includeLocal: true,
25
25
  });
26
- const envs = allContexts
27
- .filter(hasCloudSql)
28
- .map((c) => `${c.env}:${c.name}`)
29
- .sort((a, b) => {
26
+ const filteredContexts = allContexts.filter(hasCloudSql);
27
+ const sortByEnv = (a, b) => {
30
28
  const aLocal = a.startsWith("local:");
31
29
  const bLocal = b.startsWith("local:");
32
30
  if (aLocal !== bLocal)
33
31
  return aLocal ? 1 : -1;
34
32
  return a.localeCompare(b);
35
- });
33
+ };
34
+ const envs = filteredContexts
35
+ .map((c) => `${c.env}:${c.name}`)
36
+ .sort(sortByEnv);
37
+ const targetEnvChoices = filteredContexts
38
+ .map((c) => {
39
+ const value = `${c.env}:${c.name}`;
40
+ const isProd = c.environment.envType === "prod";
41
+ return {
42
+ name: isProd ? `⚠️ ${value}` : value,
43
+ value,
44
+ };
45
+ })
46
+ .sort((a, b) => sortByEnv(a.value, b.value));
36
47
  const { sourceEnvAndComponent } = await this.prompt({
37
48
  type: "list",
38
49
  name: "sourceEnvAndComponent",
@@ -76,7 +87,7 @@ exports.default = async (vorpal) => vorpal
76
87
  const { targetEnvAndComponent } = await this.prompt({
77
88
  type: "list",
78
89
  name: "targetEnvAndComponent",
79
- choices: envs,
90
+ choices: targetEnvChoices,
80
91
  message: "target env? 🤔 ",
81
92
  });
82
93
  const [targetEnv, targetComponent] = targetEnvAndComponent.split(":");
@@ -1 +1 @@
1
- {"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":";;AACA,6EAIgD;AAEhD,0EAA2F;AAE3F,gGAA6F;AAC7F,kEAAoE;AAEpE,kDAAqD;AAErD,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAE,EAAE;;IAChD,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,IAAA,yBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACpD,OAAO,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;IACjC,CAAC;IACD,IAAI,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;QAC/C,OAAO,CAAC,CAAC,CAAA,MAAA,MAAA,YAAY,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAA,CAAC;IAClD,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CACN,8BAA8B,EAC9B,yDAAyD,CAC1D;KACA,MAAM,CAAC,KAAK,UAAU,SAAS;;IAC9B,MAAM,WAAW,GAAG,MAAM,IAAA,yCAAsB,EAAC,SAAS,EAAE;QAC1D,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,WAAW;SACrB,MAAM,CAAC,WAAW,CAAC;SACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;SAChC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,MAAM,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,MAAM,KAAK,MAAM;YAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEL,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAClD,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,IAAI;QAEb,OAAO,EAAE,qDAAqD;KAC/D,CAAC,CAAC;IAEH,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAG,MAAM,IAAA,6CAA0B,EACpD,SAAS,EACT,eAAe,CAChB,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAkB,EAC5C,IAAI,EACJ,aAAa,CAAC,GAAG,EACjB,aAAa,CAAC,IAAI,CACnB,CAAC;IAEF,IAAI,WAAoC,CAAC;IACzC,IAAI,YAAoB,CAAC;IAEzB,IAAI,cAAsB,CAAC;IAC3B,IAAI,cAAsB,CAAC;IAE3B,IAAI,cAAsB,CAAC;IAC3B,IAAI,cAAsB,CAAC;IAC3B,IAAI,WAAoC,CAAC;IAEzC,IAAI,UAAkB,CAAC;IACvB,IAAI,UAAkB,CAAC;IACvB,IAAI,YAAoB,CAAC;IAEzB,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,CAAC;QACpB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,EAAE,CAAC;IACtB,CAAC,CAAC;IAEF,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,IAAA,6CAAqB,EACzC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CACtC,CAAC;QACF,UAAU,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;QAC5C,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC;QACxC,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC;QACxC,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,KAAK,CAAC;QACnB,WAAW,GAAG,MAAM,IAAA,2CAA8B,EAAC;YACjD,YAAY,EACV,aAAa,CAAC,kCAAkC,CAAC,QAAQ,EAAE;YAC7D,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;QAEH,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAClD,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACtD,YAAY,GAAG,MAAA,aAAa,CAAC,OAAO,0CAAE,QAAQ,EAAE,CAAC;IACnD,CAAC;IAED,MAAM,EAAE,qBAAqB,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAClD,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,uBAAuB;QAC7B,OAAO,EAAE,IAAI;QAEb,OAAO,EAAE,iBAAiB;KAC3B,CAAC,CAAC;IAEH,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAG,MAAM,IAAA,6CAA0B,EACpD,SAAS,EACT,eAAe,CAChB,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAkB,EAC5C,IAAI,EACJ,aAAa,CAAC,GAAG,EACjB,aAAa,CAAC,IAAI,CACnB,CAAC;IAEF,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,aAAa,GAAG,IAAA,6CAAqB,EACzC,aAAa,CAAC,YAAY,CAAC,QAAQ,EAAE,CACtC,CAAC;QAEF,UAAU,GAAG,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAG,CAAC,CAAC,0CAAE,IAAI,CAAC;QAC5C,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC;QACxC,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC;QACxC,YAAY,GAAG,aAAa,CAAC,QAAQ,CAAC;IACxC,CAAC;SAAM,CAAC;QACN,UAAU,GAAG,KAAK,CAAC;QACnB,WAAW,GAAG,MAAM,IAAA,2CAA8B,EAAC;YACjD,YAAY,EACV,aAAa,CAAC,kCAAkC,CAAC,QAAQ,EAAE;YAC7D,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;QAEH,cAAc,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAClD,cAAc,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACtD,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAClD,CAAC;IAED,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QAC3C,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,kBAAkB,SAAS,IAAI,YAAY,wBAAwB,SAAS,IAAI,YAAY,iBAAiB;KACvH,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClB,QAAQ,EAAE,CAAC;QACX,OAAO;IACT,CAAC;IAED,IAAI,aAAa,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QACjD,IAAI,CAAC,GAAG,CACN,oEAAoE,aAAa,CAAC,kCAAkC,kBAAkB,CACvI,CAAC;QACF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAC5C,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;QAEH,IACE,eAAe,KAAK,aAAa,CAAC,kCAAkC,EACpE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClB,QAAQ,EAAE,CAAC;YACX,OAAO;QACT,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAA,oBAAW,EAAC;YAChB,cAAc;YACd,UAAU;YACV,cAAc;YACd,cAAc;YACd,cAAc;YACd,UAAU;YACV,YAAY;YACZ,YAAY;SACb,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,QAAQ,EAAE,CAAC;IACb,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ const common_1 = require("../common");
10
10
  const getOnDeployExecuteScript = (context, when) => {
11
11
  const executes = getExecutes(context);
12
12
  return executes
13
- .filter(({ config }) => config.when === when)
13
+ .filter((config) => config.when === when)
14
14
  .flatMap((execute) => {
15
15
  return getJobRunScriptForExecute(context, execute);
16
16
  });
@@ -26,12 +26,7 @@ const getExecutes = (context) => {
26
26
  if (!value) {
27
27
  return [];
28
28
  }
29
- return [
30
- {
31
- jobName: key,
32
- config: value,
33
- },
34
- ];
29
+ return [value];
35
30
  }),
36
31
  ];
37
32
  };
@@ -44,22 +39,19 @@ const getLegacyExecutes = (context) => {
44
39
  }
45
40
  return [
46
41
  {
47
- jobName,
48
- config: {
49
- job: jobName,
50
- type: "job",
51
- when: job.when,
52
- ...(job.when === "preDeploy" || job.when === "postDeploy"
53
- ? {
54
- waitForCompletion: job.waitForCompletion,
55
- }
56
- : {}),
57
- },
42
+ job: jobName,
43
+ type: "job",
44
+ when: job.when,
45
+ ...(job.when === "preDeploy" || job.when === "postDeploy"
46
+ ? {
47
+ waitForCompletion: job.waitForCompletion,
48
+ }
49
+ : {}),
58
50
  },
59
51
  ];
60
52
  });
61
53
  };
62
- const getJobRunScriptForExecute = (context, { jobName, config }) => {
54
+ const getJobRunScriptForExecute = (context, config) => {
63
55
  var _a;
64
56
  const type = config.type;
65
57
  if (type === "script") {
@@ -79,7 +71,7 @@ const getJobRunScriptForExecute = (context, { jobName, config }) => {
79
71
  wait: waitForCompletion === true ? true : undefined,
80
72
  args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
81
73
  });
82
- const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
74
+ const fullJobName = (0, jobName_1.getFullJobName)(context, config.job);
83
75
  return [
84
76
  `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
85
77
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAGhD,mEAAgE;AAChE,yEAAiF;AACjF,iDAAqD;AACrD,kDAA2D;AAC3D,sCAImB;AAMZ,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,IAAiD,EACjD,EAAE;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;SAC5C,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACnB,OAAO,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAXW,QAAA,wBAAwB,4BAWnC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAa,EAAE;;IAC3D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,iBAAiB,CAAC,OAAO,CAAC;QAC7B,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACrE,+BAA+B;YAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO;gBACL;oBACE,OAAO,EAAE,GAAG;oBACZ,MAAM,EAAE,KAAK;iBACH;aACb,CAAC;QACJ,CAAC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAa,EAAE;IACjE,MAAM,aAAa,GAAG,IAAA,uCAAwB,EAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QAChD,IACE,CAAC,GAAG,CAAC,IAAI;YACT,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EACtE,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO;YACL;gBACE,OAAO;gBACP,MAAM,EAAE;oBACN,GAAG,EAAE,OAAO;oBACZ,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;wBACvD,CAAC,CAAC;4BACE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;yBACzC;wBACH,CAAC,CAAC,EAAE,CAAC;iBACa;aACvB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,OAAyB,EACzB,EAAE,OAAO,EAAE,MAAM,EAAW,EAClB,EAAE;;IACZ,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAA,mBAAW,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;QAElD,2DAA2D;QAC3D,gEAAgE;QAChE,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,SAAS;YAChB,CAAC,CAAC,mBAAmB,IAAI,MAAM;gBAC7B,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,iBAAiB,mCAAI,KAAK,CAAC,CAAC,oBAAoB;gBAC1D,CAAC,CAAC,KAAK,CAAC;QAEZ,MAAM,SAAS,GAAG,IAAA,mCAAgB,EAAC;YACjC,GAAG,UAAU;YACb,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACnD,IAAI,EAAE,IAAA,oDAA8B,EAAC,MAAM,CAAC,IAAI,CAAC;SAClD,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO;YACL,GAAG,IAAA,qBAAY,GAAE,iBAAiB,WAAW,CAAC,QAAQ,EAAE,IAAI,SAAS,EAAE;SACxE,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;AACvD,CAAC,CAAC"}
1
+ {"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}