@catladder/cli 0.0.0-node16-ddfae617 → 0.0.0-refactor-env-context-9e652b63

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.
Files changed (229) hide show
  1. package/bin/catenv +1 -1
  2. package/bin/catenv-dev +3 -0
  3. package/bin/catladder +1 -1
  4. package/bin/catladder-dev +3 -0
  5. package/dist/apps/catenv/catenv.d.ts +4 -1
  6. package/dist/apps/catenv/catenv.js +28 -20
  7. package/dist/apps/catenv/catenv.js.map +1 -1
  8. package/dist/apps/cli/commands/general/index.d.ts +1 -1
  9. package/dist/apps/cli/commands/general/portForward.d.ts +1 -1
  10. package/dist/apps/cli/commands/mongodb/index.d.ts +1 -1
  11. package/dist/apps/cli/commands/mongodb/projectMongoDestroyMember.d.ts +1 -1
  12. package/dist/apps/cli/commands/mongodb/projectMongoDestroyMember.js +2 -1
  13. package/dist/apps/cli/commands/mongodb/projectMongoDestroyMember.js.map +1 -1
  14. package/dist/apps/cli/commands/mongodb/projectMongoGetShell.d.ts +1 -1
  15. package/dist/apps/cli/commands/mongodb/projectMongoPortForward.d.ts +1 -1
  16. package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js +25 -9
  17. package/dist/apps/cli/commands/mongodb/projectMongoPortForward.js.map +1 -1
  18. package/dist/apps/cli/commands/mongodb/utils/index.js +16 -4
  19. package/dist/apps/cli/commands/mongodb/utils/index.js.map +1 -1
  20. package/dist/apps/cli/commands/project/commandCloudSqlProxy.d.ts +1 -1
  21. package/dist/apps/cli/commands/project/commandConfigSecrets.d.ts +2 -1
  22. package/dist/apps/cli/commands/project/commandConfigSecrets.js +29 -51
  23. package/dist/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
  24. package/dist/apps/cli/commands/project/commandCopyDB.d.ts +1 -1
  25. package/dist/apps/cli/commands/project/commandCopyDB.js +1 -23
  26. package/dist/apps/cli/commands/project/commandCopyDB.js.map +1 -1
  27. package/dist/apps/cli/commands/project/commandDeletePods.d.ts +1 -1
  28. package/dist/apps/cli/commands/project/commandDeletePods.js +2 -1
  29. package/dist/apps/cli/commands/project/commandDeletePods.js.map +1 -1
  30. package/dist/apps/cli/commands/project/commandDeleteProject.d.ts +1 -1
  31. package/dist/apps/cli/commands/project/commandEnvVars.d.ts +1 -1
  32. package/dist/apps/cli/commands/project/commandGetMyTotalWorktime.d.ts +1 -1
  33. package/dist/apps/cli/commands/project/commandGetShell.d.ts +1 -1
  34. package/dist/apps/cli/commands/project/commandGetShell.js +2 -1
  35. package/dist/apps/cli/commands/project/commandGetShell.js.map +1 -1
  36. package/dist/apps/cli/commands/project/commandGitlabCi.d.ts +1 -1
  37. package/dist/apps/cli/commands/project/commandGitlabCi.js.map +1 -1
  38. package/dist/apps/cli/commands/project/commandInitProject.old.d.ts +1 -1
  39. package/dist/apps/cli/commands/project/commandListPods.d.ts +1 -1
  40. package/dist/apps/cli/commands/project/commandListPods.js +2 -2
  41. package/dist/apps/cli/commands/project/commandListPods.js.map +1 -1
  42. package/dist/apps/cli/commands/project/commandMigrateHelm3.d.ts +1 -1
  43. package/dist/apps/cli/commands/project/commandMigrateHelm3.js +1 -2
  44. package/dist/apps/cli/commands/project/commandMigrateHelm3.js.map +1 -1
  45. package/dist/apps/cli/commands/project/commandNamespace.d.ts +1 -1
  46. package/dist/apps/cli/commands/project/commandOpenCostDashboard.d.ts +1 -1
  47. package/dist/apps/cli/commands/project/commandOpenDashboard.d.ts +1 -1
  48. package/dist/apps/cli/commands/project/commandOpenDashboard.js +19 -20
  49. package/dist/apps/cli/commands/project/commandOpenDashboard.js.map +1 -1
  50. package/dist/apps/cli/commands/project/commandOpenEnv.d.ts +1 -1
  51. package/dist/apps/cli/commands/project/commandOpenGit.d.ts +1 -1
  52. package/dist/apps/cli/commands/project/commandOpenGit.js +2 -7
  53. package/dist/apps/cli/commands/project/commandOpenGit.js.map +1 -1
  54. package/dist/apps/cli/commands/project/commandOpenGrafana.d.ts +1 -1
  55. package/dist/apps/cli/commands/project/commandOpenGrafanaPod.d.ts +1 -1
  56. package/dist/apps/cli/commands/project/commandOpenGrafanaPod.js +2 -1
  57. package/dist/apps/cli/commands/project/commandOpenGrafanaPod.js.map +1 -1
  58. package/dist/apps/cli/commands/project/commandOpenLogs.d.ts +1 -1
  59. package/dist/apps/cli/commands/project/commandOpenLogs.js +7 -20
  60. package/dist/apps/cli/commands/project/commandOpenLogs.js.map +1 -1
  61. package/dist/apps/cli/commands/project/commandPauseProject.d.ts +1 -1
  62. package/dist/apps/cli/commands/project/commandPortForward.d.ts +1 -1
  63. package/dist/apps/cli/commands/project/commandPortForward.js +2 -1
  64. package/dist/apps/cli/commands/project/commandPortForward.js.map +1 -1
  65. package/dist/apps/cli/commands/project/commandSecretsClearBackups.d.ts +5 -0
  66. package/dist/apps/cli/commands/project/commandSecretsClearBackups.js +90 -0
  67. package/dist/apps/cli/commands/project/commandSecretsClearBackups.js.map +1 -0
  68. package/dist/apps/cli/commands/project/commandSetup.d.ts +1 -1
  69. package/dist/apps/cli/commands/project/commandTriggerCronjob.d.ts +1 -1
  70. package/dist/apps/cli/commands/project/commandTriggerCronjob.js.map +1 -1
  71. package/dist/apps/cli/commands/project/index.d.ts +1 -1
  72. package/dist/apps/cli/commands/project/index.js +2 -0
  73. package/dist/apps/cli/commands/project/index.js.map +1 -1
  74. package/dist/apps/cli/commands/project/setup/index.d.ts +1 -1
  75. package/dist/apps/cli/commands/project/setup/setupAccessTokens.d.ts +1 -1
  76. package/dist/apps/cli/commands/project/setup/setupAccessTokens.js +5 -4
  77. package/dist/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -1
  78. package/dist/apps/cli/commands/project/setup/setupCloudRun.d.ts +3 -0
  79. package/dist/apps/cli/commands/project/setup/setupCloudRun.js +101 -0
  80. package/dist/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -0
  81. package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts +3 -0
  82. package/dist/apps/cli/commands/project/setup/setupCloudSQL.js +56 -0
  83. package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map +1 -0
  84. package/dist/apps/cli/commands/project/setup/setupContext.d.ts +2 -2
  85. package/dist/apps/cli/commands/project/setup/setupContext.js +17 -3
  86. package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -1
  87. package/dist/apps/cli/commands/project/setup/setupKubernetes.d.ts +2 -2
  88. package/dist/apps/cli/commands/project/setup/setupKubernetes.js +12 -16
  89. package/dist/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
  90. package/dist/apps/cli/commands/project/utils/ensureNamespace.d.ts +1 -1
  91. package/dist/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
  92. package/dist/apps/cli/commands/project/utils/showProjectBanner.d.ts +1 -1
  93. package/dist/apps/cli/commands/theStuffThatReallyMatters/index.d.ts +1 -1
  94. package/dist/apps/cli/config/writeConfig.d.ts +2 -2
  95. package/dist/apps/cli/verify/index.d.ts +1 -1
  96. package/dist/apps/cli/verify/migration/fromv2.d.ts +1 -1
  97. package/dist/apps/cli/verify/migration/fromv2.js.map +1 -1
  98. package/dist/apps/cli/verify/migration/migrateSecrets.d.ts +3 -3
  99. package/dist/apps/cli/verify/migration/migrateSecrets.js +4 -3
  100. package/dist/apps/cli/verify/migration/migrateSecrets.js.map +1 -1
  101. package/dist/apps/cli/verify/migration/oldGitlabCi.d.ts +1 -1
  102. package/dist/bundles/catenv/index.js +44322 -0
  103. package/dist/bundles/catenv/xdg-open +1066 -0
  104. package/dist/bundles/cli/clipboard_i686.exe +0 -0
  105. package/dist/bundles/cli/clipboard_x86_64.exe +0 -0
  106. package/dist/bundles/cli/exec-child.js +39 -0
  107. package/dist/bundles/cli/index.js +357696 -0
  108. package/dist/bundles/cli/xdg-open +1066 -0
  109. package/dist/bundles/cli/xsel +0 -0
  110. package/dist/catenv.js +3 -3
  111. package/dist/catenv.js.map +1 -1
  112. package/dist/cli.js +0 -7
  113. package/dist/cli.js.map +1 -1
  114. package/dist/config/constants.d.ts +0 -1
  115. package/dist/config/constants.js +1 -2
  116. package/dist/config/constants.js.map +1 -1
  117. package/dist/config/getProjectConfig.d.ts +3 -6
  118. package/dist/config/getProjectConfig.js +12 -7
  119. package/dist/config/getProjectConfig.js.map +1 -1
  120. package/dist/config/parseChoice.d.ts +4 -0
  121. package/dist/config/parseChoice.js +9 -0
  122. package/dist/config/parseChoice.js.map +1 -0
  123. package/dist/gcloud/artifactsRegistry.d.ts +5 -0
  124. package/dist/gcloud/artifactsRegistry.js +59 -0
  125. package/dist/gcloud/artifactsRegistry.js.map +1 -0
  126. package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.d.ts +2 -0
  127. package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js +67 -0
  128. package/dist/gcloud/cloudRun/getCloudRunDomainSuffix.js.map +1 -0
  129. package/dist/gcloud/cloudRun/openCloudRunDashboards.d.ts +3 -0
  130. package/dist/gcloud/cloudRun/openCloudRunDashboards.js +62 -0
  131. package/dist/gcloud/cloudRun/openCloudRunDashboards.js.map +1 -0
  132. package/dist/gcloud/enableServices.d.ts +3 -0
  133. package/dist/gcloud/enableServices.js +63 -0
  134. package/dist/gcloud/enableServices.js.map +1 -0
  135. package/dist/gcloud/openDashboard.d.ts +2 -0
  136. package/dist/{apps/cli/commands/shared/index.js → gcloud/openDashboard.js} +23 -27
  137. package/dist/gcloud/openDashboard.js.map +1 -0
  138. package/dist/gcloud/serviceAccounts.d.ts +12 -0
  139. package/dist/gcloud/serviceAccounts.js +144 -0
  140. package/dist/gcloud/serviceAccounts.js.map +1 -0
  141. package/dist/kubernetes/index.d.ts +3 -0
  142. package/dist/kubernetes/index.js +88 -0
  143. package/dist/kubernetes/index.js.map +1 -0
  144. package/dist/kubernetes/openKubernetesDashboards.d.ts +4 -0
  145. package/dist/kubernetes/openKubernetesDashboards.js +94 -0
  146. package/dist/kubernetes/openKubernetesDashboards.js.map +1 -0
  147. package/dist/tsconfig.tsbuildinfo +1 -1
  148. package/dist/utils/cluster.js +3 -8
  149. package/dist/utils/cluster.js.map +1 -1
  150. package/dist/utils/gitlab.d.ts +5 -3
  151. package/dist/utils/gitlab.js +165 -46
  152. package/dist/utils/gitlab.js.map +1 -1
  153. package/dist/utils/passwordstore/index.d.ts +0 -1
  154. package/dist/utils/passwordstore/index.js +1 -64
  155. package/dist/utils/passwordstore/index.js.map +1 -1
  156. package/dist/utils/projects/index.d.ts +0 -3
  157. package/dist/utils/projects/index.js +3 -53
  158. package/dist/utils/projects/index.js.map +1 -1
  159. package/package.json +24 -22
  160. package/scripts/bundle +4 -0
  161. package/src/apps/catenv/catenv.ts +15 -8
  162. package/src/apps/cli/commands/general/index.ts +1 -1
  163. package/src/apps/cli/commands/general/portForward.ts +1 -1
  164. package/src/apps/cli/commands/mongodb/index.ts +1 -1
  165. package/src/apps/cli/commands/mongodb/projectMongoDestroyMember.ts +3 -5
  166. package/src/apps/cli/commands/mongodb/projectMongoGetShell.ts +1 -1
  167. package/src/apps/cli/commands/mongodb/projectMongoPortForward.ts +16 -1
  168. package/src/apps/cli/commands/mongodb/utils/index.ts +19 -11
  169. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +1 -1
  170. package/src/apps/cli/commands/project/commandConfigSecrets.ts +12 -31
  171. package/src/apps/cli/commands/project/commandCopyDB.ts +3 -2
  172. package/src/apps/cli/commands/project/commandDeletePods.ts +3 -5
  173. package/src/apps/cli/commands/project/commandDeleteProject.ts +1 -1
  174. package/src/apps/cli/commands/project/commandEnvVars.ts +1 -1
  175. package/src/apps/cli/commands/project/commandGetMyTotalWorktime.ts +1 -1
  176. package/src/apps/cli/commands/project/commandGetShell.ts +3 -5
  177. package/src/apps/cli/commands/project/commandGitlabCi.ts +2 -1
  178. package/src/apps/cli/commands/project/commandInitProject.old.ts +1 -1
  179. package/src/apps/cli/commands/project/commandListPods.ts +2 -2
  180. package/src/apps/cli/commands/project/commandMigrateHelm3.ts +4 -3
  181. package/src/apps/cli/commands/project/commandNamespace.ts +1 -1
  182. package/src/apps/cli/commands/project/commandOpenCostDashboard.ts +1 -1
  183. package/src/apps/cli/commands/project/commandOpenDashboard.ts +12 -32
  184. package/src/apps/cli/commands/project/commandOpenEnv.ts +1 -1
  185. package/src/apps/cli/commands/project/commandOpenGit.ts +3 -3
  186. package/src/apps/cli/commands/project/commandOpenGrafana.ts +1 -1
  187. package/src/apps/cli/commands/project/commandOpenGrafanaPod.ts +3 -5
  188. package/src/apps/cli/commands/project/commandOpenLogs.ts +4 -35
  189. package/src/apps/cli/commands/project/commandPauseProject.ts +1 -1
  190. package/src/apps/cli/commands/project/commandPortForward.ts +3 -5
  191. package/src/apps/cli/commands/project/commandSecretsClearBackups.ts +27 -0
  192. package/src/apps/cli/commands/project/commandSetup.ts +1 -1
  193. package/src/apps/cli/commands/project/commandTriggerCronjob.ts +3 -2
  194. package/src/apps/cli/commands/project/index.ts +3 -1
  195. package/src/apps/cli/commands/project/setup/index.ts +1 -1
  196. package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +23 -11
  197. package/src/apps/cli/commands/project/setup/setupCloudRun.ts +74 -0
  198. package/src/apps/cli/commands/project/setup/setupCloudSQL.ts +19 -0
  199. package/src/apps/cli/commands/project/setup/setupContext.ts +12 -2
  200. package/src/apps/cli/commands/project/setup/setupKubernetes.ts +34 -27
  201. package/src/apps/cli/commands/project/utils/ensureNamespace.ts +4 -2
  202. package/src/apps/cli/commands/project/utils/showProjectBanner.ts +1 -1
  203. package/src/apps/cli/commands/theStuffThatReallyMatters/index.ts +1 -1
  204. package/src/apps/cli/config/writeConfig.ts +2 -2
  205. package/src/apps/cli/verify/index.ts +1 -1
  206. package/src/apps/cli/verify/migration/fromv2.ts +4 -7
  207. package/src/apps/cli/verify/migration/migrateSecrets.ts +9 -4
  208. package/src/apps/cli/verify/migration/oldGitlabCi.ts +1 -1
  209. package/src/catenv.ts +6 -3
  210. package/src/cli.ts +1 -7
  211. package/src/config/constants.ts +0 -2
  212. package/src/config/getProjectConfig.ts +5 -8
  213. package/src/config/parseChoice.ts +4 -0
  214. package/src/gcloud/artifactsRegistry.ts +16 -0
  215. package/src/gcloud/cloudRun/getCloudRunDomainSuffix.ts +35 -0
  216. package/src/gcloud/cloudRun/openCloudRunDashboards.ts +22 -0
  217. package/src/gcloud/enableServices.ts +14 -0
  218. package/src/gcloud/openDashboard.ts +19 -0
  219. package/src/gcloud/serviceAccounts.ts +101 -0
  220. package/src/kubernetes/index.ts +27 -0
  221. package/src/kubernetes/openKubernetesDashboards.ts +52 -0
  222. package/src/types/child-process-promise.d.ts +36 -1
  223. package/src/utils/cluster.ts +3 -3
  224. package/src/utils/gitlab.ts +137 -26
  225. package/src/utils/passwordstore/index.ts +2 -30
  226. package/src/utils/projects/index.ts +3 -24
  227. package/dist/apps/cli/commands/shared/index.d.ts +0 -3
  228. package/dist/apps/cli/commands/shared/index.js.map +0 -1
  229. package/src/apps/cli/commands/shared/index.ts +0 -36
@@ -0,0 +1,35 @@
1
+ import type { DeployConfigCloudRun } from "@catladder/pipeline";
2
+ import { exec } from "child-process-promise";
3
+
4
+ const getSuffixFromService = (service: any) => {
5
+ const fullUrl = service.status.url;
6
+ const name = service.metadata.name;
7
+
8
+ return fullUrl.replace("https://" + name + "-", "");
9
+ };
10
+ export const getCloudRunDomainSuffix = async (config: DeployConfigCloudRun) => {
11
+ /* google cloud run domains are partially predictable, they have a fixed suffix that depends on the region and project, but we don't know it beforehand
12
+
13
+ So what we do is either:
14
+ - get one service and extract its suffix
15
+ - create a dummy project, extract the suffix and save that as a gitlab variable
16
+
17
+
18
+ */
19
+
20
+ const dummyServiceName = "cl-dummy-service-delete-me";
21
+
22
+ const existingServices = await exec(
23
+ `gcloud run services list --format=json --project="${config.projectId}" --region=${config.region} --limit=1`
24
+ ).then((r) => JSON.parse(r.stdout));
25
+
26
+ if (existingServices.length > 0) {
27
+ return getSuffixFromService(existingServices[0]);
28
+ }
29
+
30
+ const result = await exec(
31
+ `gcloud run deploy ${dummyServiceName} --region=${config.region} --allow-unauthenticated --project ${config.projectId} --image=us-docker.pkg.dev/cloudrun/container/hello --format=json`
32
+ ).then((r) => JSON.parse(r.stdout));
33
+
34
+ return await getSuffixFromService(result);
35
+ };
@@ -0,0 +1,22 @@
1
+ import type { Context } from "@catladder/pipeline";
2
+ import { isOfDeployType } from "@catladder/pipeline";
3
+ import type { CommandInstance } from "vorpal";
4
+ import { openGoogleCloudDashboard } from "../openDashboard";
5
+
6
+ export const openGoogleCloudRunDashboard = async (
7
+ instance: CommandInstance,
8
+ context: Context
9
+ ) => {
10
+ if (!isOfDeployType(context.componentConfig.deploy, "google-cloudrun")) {
11
+ throw new Error("deploy type is not google-cloudrun ");
12
+ }
13
+ const { fullName } = context.environment;
14
+ const { region, projectId } = context.componentConfig.deploy;
15
+ await openGoogleCloudDashboard(
16
+ instance,
17
+ `run/detail/${region}/${fullName}/metrics`,
18
+ {
19
+ project: projectId,
20
+ }
21
+ );
22
+ };
@@ -0,0 +1,14 @@
1
+ import { exec } from "child-process-promise";
2
+
3
+ export const enableGCloudServices = async (
4
+ services: string[],
5
+ config: {
6
+ projectId: string;
7
+ }
8
+ ) => {
9
+ for (const service of services) {
10
+ await exec(
11
+ `gcloud services enable ${service} --project=${config.projectId}`
12
+ );
13
+ }
14
+ };
@@ -0,0 +1,19 @@
1
+ import type { CommandInstance } from "vorpal";
2
+ import { getGoogleAuthUserNumber } from "../apps/cli/utils/getGoogleAuthUserNumber";
3
+ import open from "open";
4
+ export const openGoogleCloudDashboard = async (
5
+ instance: CommandInstance,
6
+ path: string,
7
+ params: Record<string, string>
8
+ ) => {
9
+ const url = new URL("https://console.cloud.google.com/");
10
+ url.pathname = path;
11
+ for (const [key, value] of Object.entries(params)) {
12
+ url.searchParams.set(key, value);
13
+ }
14
+
15
+ const googleAuthUserNumber = await getGoogleAuthUserNumber.call(instance);
16
+ url.searchParams.set("authuser", googleAuthUserNumber);
17
+
18
+ open(url.toString());
19
+ };
@@ -0,0 +1,101 @@
1
+ import type { Context } from "@catladder/pipeline";
2
+
3
+ import { exec } from "child-process-promise";
4
+ import { createHmac } from "crypto";
5
+ import type { CommandInstance } from "vorpal";
6
+ import { upsertAllVariables } from "../utils/gitlab";
7
+
8
+ export const accountExists = async (fullIdentifier: string) => {
9
+ try {
10
+ await exec(`gcloud iam service-accounts describe ${fullIdentifier}`);
11
+ return true;
12
+ } catch {
13
+ return false;
14
+ }
15
+ };
16
+
17
+ type ServiceAccount = {
18
+ projectId: string;
19
+ name: string;
20
+ displayName: string;
21
+ roles: string[];
22
+ description: string;
23
+ };
24
+ const upsertGcloudServiceAccount = async (
25
+ context: Context,
26
+ account: ServiceAccount
27
+ ): Promise<string> => {
28
+ const { projectId, name, displayName, roles, description } = account;
29
+
30
+ // name has limit of 30
31
+ const namePrefix = `${name}-`;
32
+ const nameSuffix = `-${context.environment.shortName}-${context.componentName}`;
33
+ const nameMiddleLength = 30 - namePrefix.length - nameSuffix.length;
34
+ const nameMiddle = `${context.fullConfig.customerName}-${context.fullConfig.appName}`;
35
+
36
+ const middle = hashIfNessecary(nameMiddle, nameMiddleLength);
37
+
38
+ const fullName = `${namePrefix}${middle}${nameSuffix}`;
39
+
40
+ const fullDisplayName = `${context.fullConfig.customerName}-${context.fullConfig.appName} ${context.environment.shortName}:${context.componentName} | ${displayName}`;
41
+
42
+ const fullIdentifier = `${fullName}@${projectId}.iam.gserviceaccount.com`;
43
+
44
+ const existing = await accountExists(fullIdentifier);
45
+
46
+ if (!existing) {
47
+ await exec(
48
+ `gcloud iam service-accounts create ${fullName} --display-name="${fullDisplayName}" --project="${projectId}" --description="${description}"`
49
+ );
50
+ }
51
+ const memberName = `serviceAccount:${fullIdentifier}`;
52
+ for (const role of roles) {
53
+ await exec(
54
+ `gcloud projects add-iam-policy-binding ${projectId} --member=${memberName} --role=${role} `
55
+ );
56
+ }
57
+
58
+ // create key
59
+
60
+ // delete first all keys
61
+ const keys = await exec(
62
+ `gcloud iam service-accounts keys list --iam-account=${fullIdentifier} --managed-by=user --format=json`
63
+ ).then((o) => JSON.parse(o.stdout));
64
+
65
+ for (const key of keys) {
66
+ await exec(
67
+ `gcloud iam service-accounts keys delete ${key.name} --quiet --iam-account=${fullIdentifier}`
68
+ );
69
+ }
70
+
71
+ return await exec(
72
+ `gcloud iam service-accounts keys create /dev/stdout --iam-account=${fullIdentifier}`
73
+ ).then((o) => o.stdout);
74
+ };
75
+
76
+ export const upsertGcloudServiceAccountAndSaveSecret = async (
77
+ instance: CommandInstance,
78
+ context: Context,
79
+ account: ServiceAccount,
80
+ secretName: string
81
+ ): Promise<void> => {
82
+ instance.log("upserting service account " + account.name + "...");
83
+ const key = await upsertGcloudServiceAccount(context, account);
84
+
85
+ await upsertAllVariables(
86
+ instance,
87
+ {
88
+ [secretName]: key,
89
+ },
90
+ context.environment.shortName,
91
+ context.componentName
92
+ );
93
+ instance.log("done!");
94
+ };
95
+
96
+ const hashIfNessecary = (str: string, maxLength: number) =>
97
+ str.length > maxLength ? hash(str, maxLength) : str;
98
+
99
+ const hash = (str: string, length: number) => {
100
+ return createHmac("sha256", str).digest("hex").substring(0, length);
101
+ };
@@ -0,0 +1,27 @@
1
+ import { parseChoice } from "../config/parseChoice";
2
+ import { getk8sApi } from "../k8sApi";
3
+ import { getProjectNamespace } from "../utils/projects";
4
+
5
+ export const getProjectPods = async (envComponent: string) => {
6
+ const namespace = await getProjectNamespace(envComponent);
7
+ const k8sApi = getk8sApi();
8
+ const res = await k8sApi.listNamespacedPod(namespace);
9
+
10
+ const { componentName } = parseChoice(envComponent);
11
+ return res.body.items.filter((item) =>
12
+ componentName ? item.metadata?.name?.includes(componentName + "-") : true
13
+ );
14
+ };
15
+
16
+ export const getProjectPvcs = async (envComponent: string) => {
17
+ const namespace = await getProjectNamespace(envComponent);
18
+ const k8sApi = getk8sApi();
19
+ const res = await k8sApi.listNamespacedPersistentVolumeClaim(namespace);
20
+
21
+ return res.body.items;
22
+ };
23
+
24
+ export const getProjectPodNames = async (envComponent: string) => {
25
+ const pods = await getProjectPods(envComponent);
26
+ return pods.map((n) => n.metadata.name);
27
+ };
@@ -0,0 +1,52 @@
1
+ import type { Context } from "@catladder/pipeline";
2
+ import { isOfDeployType } from "@catladder/pipeline";
3
+ import type { CommandInstance } from "vorpal";
4
+ import { openGoogleCloudDashboard } from "../gcloud/openDashboard";
5
+
6
+ export const openGoogleCloudLogs = async (
7
+ instance: CommandInstance,
8
+ context: Context
9
+ ) => {
10
+ const deployConfig = context.componentConfig.deploy;
11
+ if (!isOfDeployType(deployConfig, "kubernetes")) {
12
+ throw new Error("context is not of type kubernetes");
13
+ }
14
+
15
+ if (!deployConfig.cluster || deployConfig.cluster.type !== "gcloud") {
16
+ throw new Error("no gcloud custer configured");
17
+ }
18
+
19
+ const namespace = context.environment.envVars.KUBE_NAMESPACE;
20
+ const cluster = deployConfig.cluster;
21
+
22
+ const resource = `k8s_container/cluster_name/${cluster.name}${
23
+ namespace ? `/namespace_name/${namespace}` : ""
24
+ }`;
25
+
26
+ await openGoogleCloudDashboard(instance, "logs/viewer", {
27
+ project: cluster.projectId,
28
+ resource: resource,
29
+ });
30
+ };
31
+
32
+ export const openGoogleCloudKubernetesDashboard = async (
33
+ instance: CommandInstance,
34
+ context: Context
35
+ ) => {
36
+ const deployConfig = context.componentConfig.deploy;
37
+ if (!isOfDeployType(deployConfig, "kubernetes")) {
38
+ throw new Error("context is not of type kubernetes");
39
+ }
40
+
41
+ if (!deployConfig.cluster || deployConfig.cluster.type !== "gcloud") {
42
+ throw new Error("no gcloud custer configured");
43
+ }
44
+ const namespace = context.environment.envVars.KUBE_NAMESPACE;
45
+ const cluster = deployConfig.cluster;
46
+ const pageState = `("savedViews":("c":["gke/${cluster.region}/${cluster.name}"],"n":["${namespace}"],"i":"4e42e0b9cd6147f8a4fba7516752ec48"))`;
47
+
48
+ await openGoogleCloudDashboard(instance, "kubernetes/workload", {
49
+ project: cluster.projectId,
50
+ pageState: pageState,
51
+ });
52
+ };
@@ -1 +1,36 @@
1
- declare module 'child-process-promise'
1
+ import type { ReadStream } from "fs-extra";
2
+
3
+ declare module "child-process-promise" {
4
+ function exec(
5
+ cmd: string,
6
+ options?: {
7
+ env?: Record<string, string>;
8
+ }
9
+ ): Promise<{
10
+ stdout: string;
11
+ }>;
12
+
13
+ type Stdio = "inherit" | "pipe";
14
+ type SpawnOptions = {
15
+ stdio?: Stdio | Stdio[];
16
+ shell?: boolean;
17
+ env?: Record<string, string>;
18
+ };
19
+
20
+ function spawn(
21
+ cmd: string,
22
+ options?: SpawnOptions
23
+ ): Promise<{
24
+ stdout: string;
25
+ }>;
26
+
27
+ function spawn(
28
+ cmd: string,
29
+ args: string[],
30
+ options?: SpawnOptions
31
+ ): Promise<unknown> & {
32
+ childProcess: {
33
+ stdout: ReadStream;
34
+ };
35
+ };
36
+ }
@@ -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,10 +1,10 @@
1
- import { exec } from "child-process-promise";
2
1
  import { getSecretVarName } from "@catladder/pipeline";
3
- import { isObject } from "lodash";
2
+ import { exec } from "child-process-promise";
3
+ import { has, isObject } from "lodash";
4
4
  import memoizee from "memoizee";
5
5
  import fetch from "node-fetch";
6
6
  import open from "open";
7
- import { CommandInstance } from "vorpal";
7
+ import type { CommandInstance } from "vorpal";
8
8
  import { getPreference, hasPreference, setPreference } from "./preferences";
9
9
 
10
10
  const TOKEN_KEY = "gitlab-personal-access-token";
@@ -51,15 +51,16 @@ export const getGitlabToken = async (vorpal: CommandInstance) => {
51
51
  return getPreference(TOKEN_KEY);
52
52
  };
53
53
 
54
+ type Method = "GET" | "PUT" | "POST" | "DELETE";
54
55
  export const doGitlabRequest = async <T = any>(
55
56
  vorpal: CommandInstance,
56
57
  path: string,
57
58
  data: any = undefined,
58
- update?: boolean
59
+ method: Method = "GET"
59
60
  ): Promise<T> => {
60
61
  const rootToken = await getGitlabToken(vorpal);
61
62
 
62
- const method = data ? (update ? "PUT" : "POST") : "GET";
63
+ //const method = data ? (update ? "PUT" : "POST") : "GET";
63
64
 
64
65
  const result = await fetch(`https://git.panter.ch/api/v4/${path}`, {
65
66
  method,
@@ -67,11 +68,14 @@ export const doGitlabRequest = async <T = any>(
67
68
  "Content-Type": "application/json",
68
69
  "Private-Token": rootToken,
69
70
  },
70
- body: JSON.stringify(data),
71
+ body: data ? JSON.stringify(data) : undefined,
71
72
  });
72
73
 
73
74
  if (result.status >= 200 && result.status < 400) {
74
- return result.json();
75
+ if (result.headers.get("content-type") === "application/json") {
76
+ return result.json();
77
+ }
78
+ return null;
75
79
  }
76
80
  if (result.status === 404) {
77
81
  throw new Error("not found");
@@ -90,9 +94,10 @@ export const getProjectInfo = async (
90
94
  const gitRemoteOriginUrl = (
91
95
  await exec("git config --get remote.origin.url")
92
96
  ).stdout.trim();
93
- const projectPath = /(https:\/\/|git@)git\.panter\.ch[:/](.*)\.git/g.exec(
94
- gitRemoteOriginUrl
95
- );
97
+ const projectPath =
98
+ /(https:\/\/|git@)git\.panter\.ch[:/]([^.]*)(\.git)?/g.exec(
99
+ gitRemoteOriginUrl
100
+ );
96
101
  const project = await doGitlabRequest(
97
102
  vorpal,
98
103
  `projects/${encodeURIComponent(projectPath[2])}`
@@ -143,48 +148,154 @@ const createVariable = async (
143
148
  vorpal: CommandInstance,
144
149
  projectId: string,
145
150
  key: string,
146
- value: string
151
+ value: string,
152
+ masked = true,
153
+ environment_scope = "*"
147
154
  ) => {
148
- return await doGitlabRequest(vorpal, `projects/${projectId}/variables`, {
149
- key,
150
- value,
151
- masked: isMaskable(value),
152
- });
155
+ return await doGitlabRequest(
156
+ vorpal,
157
+ `projects/${projectId}/variables`,
158
+ {
159
+ key,
160
+ value,
161
+ masked: masked && isMaskable(value),
162
+ environment_scope,
163
+ },
164
+ "POST"
165
+ );
153
166
  };
154
167
 
155
168
  const updateVariable = async (
156
169
  vorpal: CommandInstance,
157
170
  projectId: string,
158
171
  key: string,
159
- value: string
172
+ value: string,
173
+ masked = true
160
174
  ) => {
161
175
  return await doGitlabRequest(
162
176
  vorpal,
163
177
  `projects/${projectId}/variables/${key}`,
164
178
  {
165
179
  value,
166
- masked: isMaskable(value),
180
+ masked: masked && isMaskable(value),
167
181
  },
168
- true
182
+ "PUT"
183
+ );
184
+ };
185
+
186
+ const deleteVariable = async (
187
+ vorpal: CommandInstance,
188
+ projectId: string,
189
+ key: string
190
+ ) => {
191
+ return await doGitlabRequest(
192
+ vorpal,
193
+ `projects/${projectId}/variables/${key}`,
194
+ undefined,
195
+ "DELETE"
196
+ );
197
+ };
198
+
199
+ const getAllCatladderEnvVarsInGitlab = async (vorpal: CommandInstance) => {
200
+ const allVariables = await getAllVariables(vorpal).then((v) =>
201
+ v.reduce<{
202
+ [key: string]: {
203
+ value?: string;
204
+ backups: number[];
205
+ };
206
+ }>((acc, variable) => {
207
+ const { key } = variable;
208
+
209
+ if (key.startsWith("CL_")) {
210
+ const matchBackup = key.match(/(CL_.*)_backup_([0-9]+)/);
211
+
212
+ if (matchBackup) {
213
+ const key = matchBackup[1];
214
+ const timestamp = Number(matchBackup[2]);
215
+ const backups = [...(acc[key]?.backups ?? []), timestamp];
216
+ return {
217
+ ...acc,
218
+ [key]: {
219
+ ...(acc[key] ?? {}), // add value
220
+ backups,
221
+ },
222
+ };
223
+ }
224
+
225
+ return {
226
+ ...acc,
227
+ [key]: {
228
+ backups: [],
229
+ ...(acc[key] ?? {}), // may add backups
230
+ value: variable.value,
231
+ },
232
+ };
233
+ }
234
+
235
+ return acc;
236
+ }, {})
169
237
  );
238
+ return allVariables;
170
239
  };
240
+
241
+ const getBackupKey = (fullKey: string, timestamp: number) =>
242
+ `${fullKey}_backup_${timestamp}`;
243
+ export const clearBackups = async (vorpal: CommandInstance, keep: number) => {
244
+ const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal);
245
+ const { id } = await getProjectInfo(vorpal);
246
+ for (const [key, { backups }] of Object.entries(existingVariables)) {
247
+ const backupsSorted = backups.sort((a, b) => b - a);
248
+ //const toKeep = backupsSorted.slice(0, keep);
249
+ const toDelete = backupsSorted.slice(keep);
250
+
251
+ for (const timestamp of toDelete) {
252
+ await deleteVariable(vorpal, id, getBackupKey(key, timestamp));
253
+ }
254
+ }
255
+ };
256
+
171
257
  export const upsertAllVariables = async (
172
258
  vorpal: CommandInstance,
173
259
  variables: Record<string, any>,
174
260
  env: string,
175
- componentName: string
261
+ componentName: string,
262
+ backup = true,
263
+ masked = true // FIXME: would be better to have this per variable
176
264
  ): Promise<void> => {
177
265
  const { id } = await getProjectInfo(vorpal);
178
266
 
267
+ // we list all existing variables. We also gather backup versions, but its currently unused
268
+ const existingVariables = await getAllCatladderEnvVarsInGitlab(vorpal);
179
269
  for (const [key, value] of Object.entries(variables ?? {})) {
180
270
  const fullKey = getSecretVarName(env, componentName, key);
181
271
  const valueSanitized = isObject(value) ? JSON.stringify(value) : `${value}`;
182
- try {
183
- await updateVariable(vorpal, id, fullKey, valueSanitized);
184
- } catch (e) {
185
- await createVariable(vorpal, id, fullKey, valueSanitized);
186
- } finally {
187
- getAllVariables.clear();
272
+
273
+ const exists = has(existingVariables, fullKey);
274
+ const oldValue = existingVariables[fullKey]?.value;
275
+ const changed = oldValue !== valueSanitized;
276
+ if (changed) {
277
+ if (exists) {
278
+ vorpal.log(`changed: ${key}`);
279
+
280
+ await updateVariable(vorpal, id, fullKey, valueSanitized, masked);
281
+ // write backup
282
+ if (backup) {
283
+ await createVariable(
284
+ vorpal,
285
+ id,
286
+ getBackupKey(fullKey, new Date().getTime()),
287
+ oldValue,
288
+ masked,
289
+ "_backup"
290
+ );
291
+ }
292
+ } else {
293
+ vorpal.log(`new : ${key}`);
294
+ await createVariable(vorpal, id, fullKey, valueSanitized, masked);
295
+ }
296
+ } else {
297
+ vorpal.log(`skip : ${key}`);
188
298
  }
189
299
  }
300
+ getAllVariables.clear();
190
301
  };
@@ -1,9 +1,6 @@
1
1
  import { exec, spawn } from "child-process-promise";
2
2
  import commandExists from "command-exists-promise";
3
3
  import dayjs from "dayjs";
4
- import { readFile, writeFile } from "fs-extra";
5
- import { withFile } from "tmp-promise";
6
- import getEditor from "../getEditor";
7
4
  import { getPreference, hasPreference, setPreference } from "../preferences";
8
5
 
9
6
  const DEBUG = false;
@@ -18,7 +15,7 @@ const unlockBitwarden = async () => {
18
15
  let session = null;
19
16
  promise.childProcess.stdout.on(
20
17
  "data",
21
- (d: any) => (session = d.toString("utf-8"))
18
+ (d) => (session = d.toString("utf-8"))
22
19
  );
23
20
  await promise;
24
21
  await setPreference("bwsession", session);
@@ -33,7 +30,7 @@ const loginBitwarden = async () => {
33
30
  let session = null;
34
31
  promise.childProcess.stdout.on(
35
32
  "data",
36
- (d: any) => (session = d.toString("utf-8"))
33
+ (d) => (session = d.toString("utf-8"))
37
34
  );
38
35
  await promise;
39
36
  await setPreference("bwsession", session);
@@ -120,14 +117,6 @@ export const readPass = async (path: string) => {
120
117
  return result.notes || result.login?.password;
121
118
  };
122
119
 
123
- const update = async (type: string, itemId: string, value: any) => {
124
- const result = await execBitwardenCommand(
125
- `edit ${type} ${itemId} ${encode(value)}`
126
- );
127
-
128
- return result;
129
- };
130
-
131
120
  const MAX_SYNC_AGE_IN_MINUTES = 30;
132
121
  export const syncBitwarden = async (force = true) => {
133
122
  const lastSync = (await hasPreference("bwLastSync"))
@@ -171,20 +160,3 @@ export const trashItem = async (path: string) => {
171
160
 
172
161
  return result;
173
162
  };
174
- export const editPass = async (path: string) => {
175
- const item = await getItem(path);
176
-
177
- await withFile(
178
- async ({ path: tmpFilePath }) => {
179
- await writeFile(tmpFilePath, item.notes);
180
- await (await getEditor()).open(tmpFilePath);
181
- const newContent = (await readFile(tmpFilePath)).toString("utf-8");
182
-
183
- await update("item", item.id, {
184
- ...item,
185
- notes: newContent,
186
- });
187
- },
188
- { postfix: ".yml" }
189
- );
190
- };
@@ -1,11 +1,11 @@
1
- import { $ } from "zx";
2
1
  import { join } from "path";
3
2
  import { getProjectConfig, parseChoice } from "../../config/getProjectConfig";
4
- import { getk8sApi } from "../../k8sApi";
3
+
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 () => {
@@ -29,24 +29,3 @@ export const getProjectNamespace = async (envComponent: string) => {
29
29
  const config = await getProjectConfig();
30
30
  return `${config.customerName}-${config.appName}-${env}`;
31
31
  };
32
-
33
- export const getProjectPods = async (envComponent: string) => {
34
- const namespace = await getProjectNamespace(envComponent);
35
- const k8sApi = getk8sApi();
36
- const res = await k8sApi.listNamespacedPod(namespace);
37
-
38
- return res.body.items;
39
- };
40
-
41
- export const getProjectPvcs = async (envComponent: string) => {
42
- const namespace = await getProjectNamespace(envComponent);
43
- const k8sApi = getk8sApi();
44
- const res = await k8sApi.listNamespacedPersistentVolumeClaim(namespace);
45
-
46
- return res.body.items;
47
- };
48
-
49
- export const getProjectPodNames = async (envComponent: string) => {
50
- const pods = await getProjectPods(envComponent);
51
- return pods.map((n) => n.metadata.name);
52
- };
@@ -1,3 +0,0 @@
1
- import { DeployConfigKubernetesCluster } from "@catladder/pipeline";
2
- export declare const openGoogleCloudLogs: (cluster?: DeployConfigKubernetesCluster, namespace?: string, googleAuthUserNumber?: number) => Promise<void>;
3
- export declare const openGoogleCloudKubernetesDashboard: (cluster: DeployConfigKubernetesCluster, namespace: string, googleAuthUserNumber?: number) => Promise<void>;
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAwB;AAEjB,IAAM,mBAAmB,GAAG,UACjC,OAAuC,EACvC,SAAkB,EAClB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAElB,QAAQ,GAAG,qCAA8B,OAAO,CAAC,IAAI,SACzD,SAAS,CAAC,CAAC,CAAC,0BAAmB,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEG,GAAG,GAAG,+DACV,OAAO,CAAC,SAAS,SAEjB,QAAQ,CAAC,CAAC,CAAC,oBAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,uBAChD,oBAAoB,CAAE,CAAC;YACpC,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,IAAM,kCAAkC,GAAG,UAChD,OAAsC,EACtC,SAAiB,EACjB,oBAAwB;IAAxB,qCAAA,EAAA,wBAAwB;;;;YAMlB,SAAS,GAAG,wCAA4B,OAAO,CAAC,MAAM,cAAI,OAAO,CAAC,IAAI,0BAAY,SAAS,qDAA6C,CAAC;YACzI,GAAG,GAAG,wEAAiE,oBAAoB,sBAC/F,OAAO,CAAC,SAAS,wBACL,kBAAkB,CAAC,SAAS,CAAC,CAAE,CAAC;YAE9C,IAAA,iBAAI,EAAC,GAAG,CAAC,CAAC;;;;CACX,CAAC;AAfW,QAAA,kCAAkC,sCAe7C"}