@catladder/cli 1.40.3 → 1.40.4

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.
@@ -1,3 +1,3 @@
1
- export declare const getCurrentContext: () => Promise<string>;
2
- export declare const getCurrentConnectedClusterName: () => Promise<string>;
1
+ export declare const getCurrentContext: () => Promise<any>;
2
+ export declare const getCurrentConnectedClusterName: () => Promise<any>;
3
3
  export declare const connectToCluster: (fullname: string) => Promise<void>;
@@ -1,8 +1,4 @@
1
1
  "use strict";
2
- var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
3
- if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
4
- return cooked;
5
- };
6
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
7
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
8
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,10 +37,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
41
37
  };
42
38
  exports.__esModule = true;
43
39
  exports.connectToCluster = exports.getCurrentConnectedClusterName = exports.getCurrentContext = void 0;
44
- var zx_1 = require("zx");
40
+ var child_process_promise_1 = require("child-process-promise");
45
41
  var getCurrentContext = function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
46
42
  switch (_a.label) {
47
- case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["kubectl config current-context"], ["kubectl config current-context"])))];
43
+ case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl config current-context")];
48
44
  case 1: return [2 /*return*/, (_a.sent()).stdout.trim()];
49
45
  }
50
46
  }); }); };
@@ -61,7 +57,7 @@ exports.getCurrentConnectedClusterName = getCurrentConnectedClusterName;
61
57
  var connectToCluster = function (fullname) { return __awaiter(void 0, void 0, void 0, function () {
62
58
  return __generator(this, function (_a) {
63
59
  switch (_a.label) {
64
- case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["kubectl config use-context ", ""], ["kubectl config use-context ", ""])), fullname)];
60
+ case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("kubectl config use-context ".concat(fullname))];
65
61
  case 1:
66
62
  _a.sent();
67
63
  return [2 /*return*/];
@@ -69,5 +65,4 @@ var connectToCluster = function (fullname) { return __awaiter(void 0, void 0, vo
69
65
  });
70
66
  }); };
71
67
  exports.connectToCluster = connectToCluster;
72
- var templateObject_1, templateObject_2;
73
68
  //# sourceMappingURL=cluster.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAuB;AAEhB,IAAM,iBAAiB,GAAG;;gBAC9B,yBAAM,MAAC,oGAAA,gCAAgC,MAAA;gBAAxC,sBAAA,CAAC,SAAuC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;SAAA,CAAC;AAD7C,QAAA,iBAAiB,qBAC4B;AAEnD,IAAM,8BAA8B,GAAG;;;oBACrC,qBAAM,IAAA,yBAAiB,GAAE,EAAA;oBAAhC,sBAAO,SAAyB,EAAC;;;KAClC,CAAC;AAFW,QAAA,8BAA8B,kCAEzC;AAEK,IAAM,gBAAgB,GAAG,UAAO,QAAgB;;;oBACrD,yBAAM,MAAC,qGAAA,6BAA8B,EAAQ,EAAE,KAAV,QAAQ,GAAE;;gBAA/C,SAA+C,CAAC;;;;KACjD,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
1
+ {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/utils/cluster.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAEtC,IAAM,iBAAiB,GAAG;;gBAC9B,qBAAM,IAAA,4BAAI,EAAC,gCAAgC,CAAC,EAAA;gBAA7C,sBAAA,CAAC,SAA4C,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAA;;SAAA,CAAC;AADlD,QAAA,iBAAiB,qBACiC;AAExD,IAAM,8BAA8B,GAAG;;;oBACrC,qBAAM,IAAA,yBAAiB,GAAE,EAAA;oBAAhC,sBAAO,SAAyB,EAAC;;;KAClC,CAAC;AAFW,QAAA,8BAA8B,kCAEzC;AAEK,IAAM,gBAAgB,GAAG,UAAO,QAAgB;;;oBACrD,qBAAM,IAAA,4BAAI,EAAC,qCAA8B,QAAQ,CAAE,CAAC,EAAA;;gBAApD,SAAoD,CAAC;;;;KACtD,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
@@ -1,8 +1,4 @@
1
1
  "use strict";
2
- var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
3
- if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
4
- return cooked;
5
- };
6
2
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
7
3
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
8
4
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,15 +37,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
41
37
  };
42
38
  exports.__esModule = true;
43
39
  exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
44
- var zx_1 = require("zx");
45
40
  var path_1 = require("path");
46
41
  var getProjectConfig_1 = require("../../config/getProjectConfig");
47
42
  var k8sApi_1 = require("../../k8sApi");
48
43
  var files_1 = require("../files");
44
+ var child_process_promise_1 = require("child-process-promise");
49
45
  var getGitRoot = function () { return __awaiter(void 0, void 0, void 0, function () {
50
46
  return __generator(this, function (_a) {
51
47
  switch (_a.label) {
52
- case 0: return [4 /*yield*/, (0, zx_1.$)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["git rev-parse --show-toplevel"], ["git rev-parse --show-toplevel"])))];
48
+ case 0: return [4 /*yield*/, (0, child_process_promise_1.exec)("git rev-parse --show-toplevel")];
53
49
  case 1: return [2 /*return*/, (_a.sent()).stdout.trim()];
54
50
  }
55
51
  });
@@ -150,5 +146,4 @@ var getProjectPodNames = function (envComponent) { return __awaiter(void 0, void
150
146
  });
151
147
  }); };
152
148
  exports.getProjectPodNames = getProjectPodNames;
153
- var templateObject_1;
154
149
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -16,7 +16,7 @@
16
16
  "catladder": "./bin/catladder"
17
17
  },
18
18
  "dependencies": {
19
- "@catladder/pipeline": "1.40.3",
19
+ "@catladder/pipeline": "1.40.4",
20
20
  "@kubernetes/client-node": "^0.16.2",
21
21
  "child-process-promise": "^2.2.1",
22
22
  "clipboardy": "^2.0.0",
@@ -33,8 +33,7 @@
33
33
  "prettier": "^2.5.1",
34
34
  "tmp-promise": "^2.0.2",
35
35
  "update-notifier": "^2.5.0",
36
- "vorpal": "^1.12.0",
37
- "zx": "^4.3.0"
36
+ "vorpal": "^1.12.0"
38
37
  },
39
38
  "engines": {
40
39
  "node": ">=12.0.0"
@@ -56,5 +55,5 @@
56
55
  "eslint": "^8.7.0",
57
56
  "typescript": "^4.5.4"
58
57
  },
59
- "version": "1.40.3"
58
+ "version": "1.40.4"
60
59
  }
@@ -1,5 +1,5 @@
1
1
  import Vorpal from "vorpal";
2
- import { $ } from "zx";
2
+ import { exec } from "child-process-promise";
3
3
 
4
4
  export default async (vorpal: Vorpal) =>
5
5
  vorpal
@@ -8,5 +8,5 @@ export default async (vorpal: Vorpal) =>
8
8
  "open the repo on gitlab / github in your browser"
9
9
  )
10
10
  .action(async () => {
11
- await $`npx git-open`;
11
+ await exec("npx git-open");
12
12
  });
@@ -4,7 +4,7 @@ import {
4
4
  isOfDeployType,
5
5
  } from "@catladder/pipeline";
6
6
  import { CommandInstance } from "vorpal";
7
- import { $ } from "zx";
7
+ import { exec } from "child-process-promise";
8
8
  import { connectToCluster } from "../../../../../utils/cluster";
9
9
  import { upsertAllVariables } from "../../../../../utils/gitlab";
10
10
  import ensureNamespace from "../utils/ensureNamespace";
@@ -33,25 +33,32 @@ export const setupKubernetes = async (
33
33
  // we currently create one per component to better separate them
34
34
  instance.log("ensuring service accounts...");
35
35
  const serviceAccountName = `cl-${context.componentName}-deploy`;
36
- const KUBE_URL =
37
- await $`TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`.then(
38
- (s) => s.stdout.trim()
39
- );
36
+ const KUBE_URL = await exec(
37
+ `TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'`
38
+ ).then((s: any) => s.stdout.trim());
40
39
 
41
40
  // first upsert service acount in the ns
42
41
  try {
43
- await $`kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`;
44
- await $`kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`;
45
- await $`kubectl delete role --namespace ${namespace} ${serviceAccountName}`;
42
+ await exec(
43
+ `kubectl delete serviceaccount --namespace ${namespace} ${serviceAccountName}`
44
+ );
45
+ await exec(
46
+ `kubectl delete rolebinding --namespace ${namespace} ${serviceAccountName}`
47
+ );
48
+ await exec(
49
+ `kubectl delete role --namespace ${namespace} ${serviceAccountName}`
50
+ );
46
51
  } catch (e) {
47
52
  // ignore
48
53
  }
49
54
 
50
- await $`kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`;
55
+ await exec(
56
+ `kubectl create serviceaccount --namespace ${namespace} ${serviceAccountName}`
57
+ );
51
58
 
52
59
  // upsert role in the ns
53
60
 
54
- await $`cat <<EOF | kubectl apply -f -
61
+ await exec(`cat <<EOF | kubectl apply -f -
55
62
  kind: Role
56
63
  apiVersion: rbac.authorization.k8s.io/v1
57
64
  metadata:
@@ -76,20 +83,19 @@ roleRef:
76
83
  name: ${serviceAccountName}
77
84
  apiGroup: rbac.authorization.k8s.io
78
85
  EOF
79
- `;
86
+ `);
80
87
 
81
88
  // get token name
82
- const tokenName =
83
- await $`kubectl get serviceaccount --namespace ${namespace} ${serviceAccountName} -o jsonpath='{.secrets[0].name}'`;
89
+ const tokenName = await exec(
90
+ `kubectl get serviceaccount --namespace ${namespace} ${serviceAccountName} -o jsonpath='{.secrets[0].name}'`
91
+ ).then((c: any) => c.stdout.trim());
84
92
 
85
- const KUBE_CA_PEM =
86
- await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`.then(
87
- (c) => c.stdout.trim()
88
- );
89
- const KUBE_TOKEN =
90
- await $`kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`.then(
91
- (c) => c.stdout.trim()
92
- );
93
+ const KUBE_CA_PEM = await exec(
94
+ `kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['ca\\.crt']}"`
95
+ ).then((c: any) => c.stdout.trim());
96
+ const KUBE_TOKEN = await exec(
97
+ `kubectl get secret ${tokenName} --namespace ${namespace} -o jsonpath="{['data']['token']}" | base64 --decode`
98
+ ).then((c: any) => c.stdout.trim());
93
99
 
94
100
  const vars = {
95
101
  KUBE_TOKEN,
package/src/catenv.ts CHANGED
@@ -1,10 +1,11 @@
1
1
  import catenv from "./apps/catenv/catenv";
2
- import { $, argv } from "zx";
2
+
3
3
  import { parseChoice } from "./config/getProjectConfig";
4
4
 
5
- const choice = argv._[0] ? parseChoice(argv._[0]) : null;
5
+ const choice = process.argv[2] ? parseChoice(process.argv[2]) : null;
6
+
7
+ console.log(process.argv, choice);
6
8
 
7
- $.verbose = false;
8
9
  catenv(choice).then(() => {
9
10
  // we have to exit manually, because we have some file watches
10
11
  process.exit();
package/src/cli.ts CHANGED
@@ -1,8 +1,7 @@
1
1
  import updateNotifier from "update-notifier";
2
2
  import cli from "./apps/cli/cli";
3
3
  import packageInfos from "./packageInfos";
4
- import { $ } from "zx";
5
- $.verbose = false;
4
+
6
5
  updateNotifier({
7
6
  pkg: packageInfos,
8
7
  }).notify();
@@ -1,12 +1,12 @@
1
- import { $ } from "zx";
1
+ import { exec } from "child-process-promise";
2
2
 
3
3
  export const getCurrentContext = async () =>
4
- (await $`kubectl config current-context`).stdout.trim();
4
+ (await exec(`kubectl config current-context`)).stdout.trim();
5
5
 
6
6
  export const getCurrentConnectedClusterName = async () => {
7
7
  return await getCurrentContext();
8
8
  };
9
9
 
10
10
  export const connectToCluster = async (fullname: string) => {
11
- await $`kubectl config use-context ${fullname}`;
11
+ await exec(`kubectl config use-context ${fullname}`);
12
12
  };
@@ -1,11 +1,11 @@
1
- import { $ } from "zx";
2
1
  import { join } from "path";
3
2
  import { getProjectConfig, parseChoice } from "../../config/getProjectConfig";
4
3
  import { getk8sApi } from "../../k8sApi";
5
4
  import { readFileOrError } from "../files";
5
+ import { exec } from "child-process-promise";
6
6
 
7
7
  export const getGitRoot = async (): Promise<string> => {
8
- return (await $`git rev-parse --show-toplevel`).stdout.trim();
8
+ return (await exec(`git rev-parse --show-toplevel`)).stdout.trim();
9
9
  };
10
10
 
11
11
  export const getRootGitlabCiFile = async () => {