@catladder/cli 5.0.1 → 5.1.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.
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/checkGithub.js +3 -3
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/checkGithub.js.map +1 -1
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/checkGithubImageCasing.d.ts +15 -0
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/checkGithubImageCasing.js +60 -0
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/checkGithubImageCasing.js.map +1 -0
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/index.js +2 -0
- package/dist/apps/cli/src/apps/cli/commands/project/doctor/index.js.map +1 -1
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js +2 -2
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupAccessTokens.js.map +1 -1
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupGithub.js +2 -2
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupGithub.js.map +1 -1
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +23 -7
- package/dist/apps/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/apps/cli/src/commands/index.d.ts +1 -0
- package/dist/apps/cli/src/commands/index.js +4 -1
- package/dist/apps/cli/src/commands/index.js.map +1 -1
- package/dist/apps/cli/src/commands/project/commandConfigSecrets.js +2 -1
- package/dist/apps/cli/src/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/apps/cli/src/commands/project/commandMrPin.d.ts +21 -0
- package/dist/apps/cli/src/commands/project/commandMrPin.js +119 -0
- package/dist/apps/cli/src/commands/project/commandMrPin.js.map +1 -0
- package/dist/apps/cli/src/commands/project/commandSecretsSyncGithub.d.ts +1 -42
- package/dist/apps/cli/src/commands/project/commandSecretsSyncGithub.js +5 -124
- package/dist/apps/cli/src/commands/project/commandSecretsSyncGithub.js.map +1 -1
- package/dist/apps/cli/src/commands/project/secrets/commandSecretsPush.js +2 -1
- package/dist/apps/cli/src/commands/project/secrets/commandSecretsPush.js.map +1 -1
- package/dist/apps/cli/src/commands/project/secrets/commandSecretsSet.js +2 -2
- package/dist/apps/cli/src/commands/project/secrets/commandSecretsSet.js.map +1 -1
- package/dist/apps/cli/src/commands/project/secrets/document.d.ts +1 -12
- package/dist/apps/cli/src/commands/project/secrets/document.js +1 -79
- package/dist/apps/cli/src/commands/project/secrets/document.js.map +1 -1
- package/dist/apps/cli/src/gcloud/serviceAccounts.js +15 -4
- package/dist/apps/cli/src/gcloud/serviceAccounts.js.map +1 -1
- package/dist/apps/cli/src/secrets/github.d.ts +41 -0
- package/dist/apps/cli/src/secrets/github.js +127 -0
- package/dist/apps/cli/src/secrets/github.js.map +1 -0
- package/dist/apps/cli/src/secrets/index.d.ts +2 -0
- package/dist/apps/cli/src/secrets/index.js +19 -0
- package/dist/apps/cli/src/secrets/index.js.map +1 -0
- package/dist/apps/cli/src/secrets/writeSecrets.d.ts +18 -0
- package/dist/apps/cli/src/secrets/writeSecrets.js +88 -0
- package/dist/apps/cli/src/secrets/writeSecrets.js.map +1 -0
- package/dist/apps/cli/src/utils/github.js +2 -2
- package/dist/apps/cli/src/utils/github.js.map +1 -1
- package/dist/apps/cli/src/utils/gitlab.d.ts +10 -0
- package/dist/apps/cli/src/utils/gitlab.js +30 -5
- package/dist/apps/cli/src/utils/gitlab.js.map +1 -1
- package/dist/apps/cli/src/vault/BitwardenVault.d.ts +6 -0
- package/dist/apps/cli/src/vault/BitwardenVault.js +11 -1
- package/dist/apps/cli/src/vault/BitwardenVault.js.map +1 -1
- package/dist/apps/cli/src/vault/GitlabVault.d.ts +2 -2
- package/dist/apps/cli/src/vault/GitlabVault.js +3 -2
- package/dist/apps/cli/src/vault/GitlabVault.js.map +1 -1
- package/dist/apps/cli/src/vault/VaultManager.d.ts +2 -2
- package/dist/apps/cli/src/vault/VaultManager.js +2 -2
- package/dist/apps/cli/src/vault/VaultManager.js.map +1 -1
- package/dist/apps/cli/src/vault/types.d.ts +16 -2
- package/dist/bundles/catenv/index.js +265 -28
- package/dist/bundles/cli/index.js +851 -329
- package/dist/bundles/skills/catladder-cli/references/commands.md +13 -0
- package/dist/bundles/skills/catladder-config/SKILL.md +3 -1
- package/dist/bundles/skills/catladder-deploys/SKILL.md +7 -0
- package/dist/bundles/skills/catladder-migrate-ci-backend/SKILL.md +18 -2
- package/dist/bundles/skills/catladder-pipelines/SKILL.md +51 -1
- package/dist/bundles/skills/catladder-secrets/SKILL.md +16 -0
- package/dist/packages/pipeline/src/autoStop.d.ts +22 -0
- package/dist/packages/pipeline/src/autoStop.js +30 -0
- package/dist/packages/pipeline/src/autoStop.js.map +1 -0
- package/dist/packages/pipeline/src/backends/github/GithubBackend.js +11 -5
- package/dist/packages/pipeline/src/backends/github/GithubBackend.js.map +1 -1
- package/dist/packages/pipeline/src/backends/github/ciVariables.d.ts +13 -2
- package/dist/packages/pipeline/src/backends/github/ciVariables.js +18 -5
- package/dist/packages/pipeline/src/backends/github/ciVariables.js.map +1 -1
- package/dist/packages/pipeline/src/backends/github/createGithubJobs.js +1 -1
- package/dist/packages/pipeline/src/backends/github/createGithubJobs.js.map +1 -1
- package/dist/packages/pipeline/src/backends/github/ghcr.d.ts +29 -0
- package/dist/packages/pipeline/src/backends/github/ghcr.js +40 -0
- package/dist/packages/pipeline/src/backends/github/ghcr.js.map +1 -0
- package/dist/packages/pipeline/src/backends/github/index.d.ts +2 -0
- package/dist/packages/pipeline/src/backends/github/index.js +2 -0
- package/dist/packages/pipeline/src/backends/github/index.js.map +1 -1
- package/dist/packages/pipeline/src/backends/github/registryImage.d.ts +20 -0
- package/dist/packages/pipeline/src/backends/github/registryImage.js +49 -0
- package/dist/packages/pipeline/src/backends/github/registryImage.js.map +1 -0
- package/dist/packages/pipeline/src/backends/gitlab/GitlabBackend.js +2 -0
- package/dist/packages/pipeline/src/backends/gitlab/GitlabBackend.js.map +1 -1
- package/dist/packages/pipeline/src/backends/gitlab/createGitlabPipeline.d.ts +4 -1
- package/dist/packages/pipeline/src/backends/gitlab/createGitlabPipeline.js +21 -1
- package/dist/packages/pipeline/src/backends/gitlab/createGitlabPipeline.js.map +1 -1
- package/dist/packages/pipeline/src/customImages/jobImagesPlan.d.ts +15 -3
- package/dist/packages/pipeline/src/customImages/jobImagesPlan.js +14 -3
- package/dist/packages/pipeline/src/customImages/jobImagesPlan.js.map +1 -1
- package/dist/packages/pipeline/src/deploy/base/deploy.js +8 -2
- package/dist/packages/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/packages/pipeline/src/index.d.ts +1 -0
- package/dist/packages/pipeline/src/index.js +1 -0
- package/dist/packages/pipeline/src/index.js.map +1 -1
- package/dist/packages/pipeline/src/types/config.d.ts +44 -0
- package/dist/skills/catladder-cli/references/commands.md +13 -0
- package/dist/skills/catladder-config/SKILL.md +3 -1
- package/dist/skills/catladder-deploys/SKILL.md +7 -0
- package/dist/skills/catladder-migrate-ci-backend/SKILL.md +18 -2
- package/dist/skills/catladder-pipelines/SKILL.md +51 -1
- package/dist/skills/catladder-secrets/SKILL.md +16 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/doctor/checkGithub.ts +1 -1
- package/src/apps/cli/commands/project/doctor/checkGithubImageCasing.ts +87 -0
- package/src/apps/cli/commands/project/doctor/index.ts +2 -0
- package/src/apps/cli/commands/project/setup/setupAccessTokens.ts +3 -2
- package/src/apps/cli/commands/project/setup/setupGithub.ts +1 -1
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +31 -20
- package/src/commands/index.ts +1 -0
- package/src/commands/project/commandConfigSecrets.ts +1 -1
- package/src/commands/project/commandMrPin.ts +184 -0
- package/src/commands/project/commandSecretsSyncGithub.ts +7 -154
- package/src/commands/project/secrets/commandSecretsPush.ts +2 -5
- package/src/commands/project/secrets/commandSecretsSet.ts +2 -2
- package/src/commands/project/secrets/document.ts +2 -127
- package/src/gcloud/serviceAccounts.ts +16 -7
- package/src/secrets/__tests__/writeSecrets.test.ts +147 -0
- package/src/secrets/github.ts +157 -0
- package/src/secrets/index.ts +2 -0
- package/src/secrets/writeSecrets.ts +138 -0
- package/src/utils/github.ts +2 -4
- package/src/utils/gitlab.ts +34 -7
- package/src/vault/BitwardenVault.ts +10 -1
- package/src/vault/GitlabVault.ts +9 -2
- package/src/vault/VaultManager.ts +3 -2
- package/src/vault/__tests__/BitwardenVault.test.ts +88 -0
- package/src/vault/types.ts +17 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkGithub = void 0;
|
|
4
4
|
const pipeline_1 = require("../../../../../../../../packages/pipeline/src/index.js");
|
|
5
|
-
const
|
|
5
|
+
const secrets_1 = require("../../../../../secrets");
|
|
6
6
|
const concurrency_1 = require("../../../../../utils/concurrency");
|
|
7
7
|
const github_1 = require("../../../../../utils/github");
|
|
8
8
|
const githubMergeGating_1 = require("../githubMergeGating");
|
|
@@ -23,14 +23,14 @@ const checkGithub = async (report, config) => {
|
|
|
23
23
|
report.warn("github cli (gh) not authenticated — github checks skipped", "run: gh auth login");
|
|
24
24
|
return;
|
|
25
25
|
}
|
|
26
|
-
const repo = await (0,
|
|
26
|
+
const repo = await (0, secrets_1.getConfiguredGithubRepo)();
|
|
27
27
|
if (!repo) {
|
|
28
28
|
report.fail(`no github repository found on the '${(0, pipeline_1.getPipelineGitRemote)(config, "github")}' remote`);
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
let targets;
|
|
32
32
|
try {
|
|
33
|
-
targets = await (0,
|
|
33
|
+
targets = await (0, secrets_1.collectSecretTargets)(config);
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
36
36
|
report.warn(`could not generate the github workflows to derive secret references (${e.message})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkGithub.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/doctor/checkGithub.ts"],"names":[],"mappings":";;;AACA,kDAI6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"checkGithub.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/doctor/checkGithub.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { Config } from "../../../../../../../../packages/pipeline/src/index.js";
|
|
2
|
+
import type { DoctorReport } from "./DoctorReport";
|
|
3
|
+
/**
|
|
4
|
+
* ghcr image paths must be lowercase, but `${{ github.repository }}`
|
|
5
|
+
* interpolates github's display casing — so a repository whose owner or
|
|
6
|
+
* name contains an uppercase character needs a lowercased literal in the
|
|
7
|
+
* generated workflows. Generation bakes that in, which means committed
|
|
8
|
+
* workflows generated by an older catladder (or hand-edited ones) still
|
|
9
|
+
* carry the expression and fail every docker job with
|
|
10
|
+
* `repository name must be lowercase`.
|
|
11
|
+
*
|
|
12
|
+
* Unlike the rest of the github checks this needs no `gh` login — only
|
|
13
|
+
* the git remote and the committed files.
|
|
14
|
+
*/
|
|
15
|
+
export declare const checkGithubImageCasing: (report: DoctorReport, config: Config) => Promise<void>;
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.checkGithubImageCasing = void 0;
|
|
4
|
+
const promises_1 = require("fs/promises");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const pipeline_1 = require("../../../../../../../../packages/pipeline/src/index.js");
|
|
7
|
+
const secrets_1 = require("../../../../../secrets");
|
|
8
|
+
const WORKFLOWS_FOLDER = ".github/workflows";
|
|
9
|
+
const GENERATED_FILE_PREFIX = "catladder-";
|
|
10
|
+
/**
|
|
11
|
+
* the generated workflow files, or an empty list when none exist yet
|
|
12
|
+
*/
|
|
13
|
+
const readGeneratedWorkflows = async () => {
|
|
14
|
+
const entries = await (0, promises_1.readdir)(WORKFLOWS_FOLDER).catch(() => []);
|
|
15
|
+
return Promise.all(entries
|
|
16
|
+
.filter((file) => file.startsWith(GENERATED_FILE_PREFIX))
|
|
17
|
+
.map((file) => (0, promises_1.readFile)((0, path_1.join)(WORKFLOWS_FOLDER, file), "utf8")));
|
|
18
|
+
};
|
|
19
|
+
/**
|
|
20
|
+
* ghcr image paths must be lowercase, but `${{ github.repository }}`
|
|
21
|
+
* interpolates github's display casing — so a repository whose owner or
|
|
22
|
+
* name contains an uppercase character needs a lowercased literal in the
|
|
23
|
+
* generated workflows. Generation bakes that in, which means committed
|
|
24
|
+
* workflows generated by an older catladder (or hand-edited ones) still
|
|
25
|
+
* carry the expression and fail every docker job with
|
|
26
|
+
* `repository name must be lowercase`.
|
|
27
|
+
*
|
|
28
|
+
* Unlike the rest of the github checks this needs no `gh` login — only
|
|
29
|
+
* the git remote and the committed files.
|
|
30
|
+
*/
|
|
31
|
+
const checkGithubImageCasing = async (report, config) => {
|
|
32
|
+
if (!(0, pipeline_1.getEnabledPipelineTypes)(config).includes("github"))
|
|
33
|
+
return;
|
|
34
|
+
const repo = await (0, secrets_1.getConfiguredGithubRepo)();
|
|
35
|
+
if (!repo || repo === repo.toLowerCase()) {
|
|
36
|
+
// an all-lowercase repository keeps the expression on purpose (it
|
|
37
|
+
// stays correct in forks), and an unresolvable remote is reported
|
|
38
|
+
// by checkGithub already
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
report.section("github image names");
|
|
42
|
+
const workflows = await readGeneratedWorkflows();
|
|
43
|
+
if (workflows.length === 0) {
|
|
44
|
+
report.warn(`no generated workflows in ${WORKFLOWS_FOLDER} to check`, "run: catenv");
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const stale = workflows.filter((content) => content.includes(pipeline_1.GHCR_REPOSITORY_EXPRESSION));
|
|
48
|
+
if (stale.length > 0) {
|
|
49
|
+
report.fail(`'${repo}' is mixed-case, but ${stale.length}/${workflows.length} generated workflows still use ${pipeline_1.GHCR_REPOSITORY_EXPRESSION} — ghcr rejects uppercase image paths, so every docker job fails with "repository name must be lowercase"`, "run: catenv (and commit the regenerated workflows)");
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
const uppercase = workflows.flatMap((content) => [...content.matchAll(/ghcr\.io\/\S*[A-Z]\S*/g)].map(([match]) => match));
|
|
53
|
+
if (uppercase.length > 0) {
|
|
54
|
+
report.fail(`uppercase ghcr image paths in the generated workflows: ${[...new Set(uppercase)].join(", ")}`, `run: catenv — if it persists, set pipelines.github.repository (the '${(0, pipeline_1.getPipelineGitRemote)(config, "github")}' remote resolves to '${repo}')`);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
report.ok(`ghcr image paths lowercased for '${repo}'`);
|
|
58
|
+
};
|
|
59
|
+
exports.checkGithubImageCasing = checkGithubImageCasing;
|
|
60
|
+
//# sourceMappingURL=checkGithubImageCasing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkGithubImageCasing.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/doctor/checkGithubImageCasing.ts"],"names":[],"mappings":";;;AAAA,0CAAgD;AAChD,+BAA4B;AAE5B,kDAI6B;AAC7B,oDAAiE;AAGjE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAC7C,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAE3C;;GAEG;AACH,MAAM,sBAAsB,GAAG,KAAK,IAAuB,EAAE;IAC3D,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC,GAAG,CAChB,OAAO;SACJ,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;SACxD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CACjE,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACI,MAAM,sBAAsB,GAAG,KAAK,EACzC,MAAoB,EACpB,MAAc,EACd,EAAE;IACF,IAAI,CAAC,IAAA,kCAAuB,EAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO;IAEhE,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAuB,GAAE,CAAC;IAC7C,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACzC,kEAAkE;QAClE,kEAAkE;QAClE,yBAAyB;QACzB,OAAO;IACT,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAErC,MAAM,SAAS,GAAG,MAAM,sBAAsB,EAAE,CAAC;IACjD,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,CACT,6BAA6B,gBAAgB,WAAW,EACxD,aAAa,CACd,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACzC,OAAO,CAAC,QAAQ,CAAC,qCAA0B,CAAC,CAC7C,CAAC;IACF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,IAAI,CACT,IAAI,IAAI,wBAAwB,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,MAAM,kCAAkC,qCAA0B,2GAA2G,EACvO,oDAAoD,CACrD,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9C,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CACxE,CAAC;IACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CACT,0DAA0D,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAC9F,uEAAuE,IAAA,+BAAoB,EAAC,MAAM,EAAE,QAAQ,CAAC,yBAAyB,IAAI,IAAI,CAC/I,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,oCAAoC,IAAI,GAAG,CAAC,CAAC;AACzD,CAAC,CAAC;AAhDW,QAAA,sBAAsB,0BAgDjC"}
|
|
@@ -5,6 +5,7 @@ const pipeline_1 = require("../../../../../../../../packages/pipeline/src/index.
|
|
|
5
5
|
const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
|
|
6
6
|
const checkCloudRun_1 = require("./checkCloudRun");
|
|
7
7
|
const checkGithub_1 = require("./checkGithub");
|
|
8
|
+
const checkGithubImageCasing_1 = require("./checkGithubImageCasing");
|
|
8
9
|
const checkGitlab_1 = require("./checkGitlab");
|
|
9
10
|
const checkStore_1 = require("./checkStore");
|
|
10
11
|
const DoctorReport_1 = require("./DoctorReport");
|
|
@@ -40,6 +41,7 @@ const doctorProject = async (instance, onlyComponents) => {
|
|
|
40
41
|
await (0, checkGitlab_1.checkGitlab)(instance, report, contexts);
|
|
41
42
|
}
|
|
42
43
|
await (0, checkCloudRun_1.checkCloudRun)(report, contexts);
|
|
44
|
+
await (0, checkGithubImageCasing_1.checkGithubImageCasing)(report, config);
|
|
43
45
|
await (0, checkGithub_1.checkGithub)(report, config);
|
|
44
46
|
report.summarize();
|
|
45
47
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/doctor/index.ts"],"names":[],"mappings":";;;AACA,kDAA8D;AAC9D,6EAGgD;AAEhD,mDAAgD;AAChD,+CAA4C;AAC5C,+CAA4C;AAC5C,6CAA0C;AAC1C,iDAA8C;AAE9C;;;;;;;;;;;GAWG;AACI,MAAM,aAAa,GAAG,KAAK,EAChC,QAAY,EACZ,cAAkC,EAClC,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,QAAQ,CAAC,GAAG,CACV,oEAAoE,CACrE,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,2BAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,QAAQ,GAAuB,EAAE,CAAC;IACtC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAA,yCAAsB,EAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CACT,uCAAuC,CAAC,CAAC,OAAO,EAAE,EAClD,8BAA8B,CAC/B,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,kCAAuB,EAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAA,yBAAW,EAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,IAAA,6BAAa,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,IAAA,yBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC,MAAM,CAAC,SAAS,EAAE,CAAC;AACrB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/doctor/index.ts"],"names":[],"mappings":";;;AACA,kDAA8D;AAC9D,6EAGgD;AAEhD,mDAAgD;AAChD,+CAA4C;AAC5C,qEAAkE;AAClE,+CAA4C;AAC5C,6CAA0C;AAC1C,iDAA8C;AAE9C;;;;;;;;;;;GAWG;AACI,MAAM,aAAa,GAAG,KAAK,EAChC,QAAY,EACZ,cAAkC,EAClC,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,QAAQ,CAAC,GAAG,CACV,oEAAoE,CACrE,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,2BAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,IAAA,uBAAU,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,QAAQ,GAAuB,EAAE,CAAC;IACtC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAA,yCAAsB,EAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACpC,MAAM,CAAC,IAAI,CACT,uCAAuC,CAAC,CAAC,OAAO,EAAE,EAClD,8BAA8B,CAC/B,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,kCAAuB,EAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAA,yBAAW,EAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,IAAA,6BAAa,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,IAAA,+CAAsB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,MAAM,IAAA,yBAAW,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC,MAAM,CAAC,SAAS,EAAE,CAAC;AACrB,CAAC,CAAC;AAlCW,QAAA,aAAa,iBAkCxB"}
|
|
@@ -25,10 +25,10 @@ const setupAccessTokens = async (instance) => {
|
|
|
25
25
|
await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables/GL_TOKEN`, { value: newToken.token }, "PUT");
|
|
26
26
|
}
|
|
27
27
|
catch (e) {
|
|
28
|
-
if (e
|
|
28
|
+
if (!(e instanceof gitlab_1.GitlabNotFoundError)) {
|
|
29
29
|
throw e;
|
|
30
30
|
}
|
|
31
|
-
// not
|
|
31
|
+
// the variable does not exist yet: create it
|
|
32
32
|
await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/variables`, {
|
|
33
33
|
key: "GL_TOKEN",
|
|
34
34
|
value: newToken.token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"setupAccessTokens.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupAccessTokens.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AACvC,wDAKqC;AAErC,MAAM,UAAU,GAAG,kBAAkB,CAAC;AAE/B,MAAM,iBAAiB,GAAG,KAAK,EAAE,QAAY,EAAE,EAAE;IACtD,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,uBAAc,EAAC,QAAQ,CAAC,CAAC;IAEzD,gEAAgE;IAChE,kEAAkE;IAClE,qEAAqE;IACrE,MAAM,aAAa,GAAG,MAAM,IAAA,gCAAuB,EACjD,QAAQ,EACR,YAAY,SAAS,gBAAgB,CACtC,CAAC;IACF,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAC9B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAClD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,iBAAM,EACvB,IAAA,cAAG,EAAC,IAAI,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,EACvC,YAAY,CACb,CAAC;IAEF,MAAM,QAAQ,GAAG,KAAK;QACpB,CAAC,CAAC,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,kBAAkB,KAAK,CAAC,EAAE,SAAS,EACxD,EAAE,UAAU,EAAE,EACd,MAAM,CACP;QACH,CAAC,CAAC,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,gBAAgB,EACrC;YACE,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,CAAC;YAClC,YAAY,EAAE,EAAE,EAAE,aAAa;YAC/B,UAAU;SACX,EACD,MAAM,CACP,CAAC;IAEN,IAAI,CAAC;QACH,MAAM,IAAA,wBAAe,EAAC,QAAQ,EAAE,YAAY,SAAS,qBAAqB,CAAC,CAAC;QAC5E,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,qBAAqB,EAC1C,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,EACzB,KAAK,CACN,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,CAAC,YAAY,4BAAmB,CAAC,EAAE,CAAC;YACxC,MAAM,CAAC,CAAC;QACV,CAAC;QACD,6CAA6C;QAC7C,MAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,YAAY,SAAS,YAAY,EACjC;YACE,GAAG,EAAE,UAAU;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,MAAM,EAAE,IAAI;SACb,EACD,MAAM,CACP,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,GAAG,CACV,kEAAkE,CACnE,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,iBAAiB,qBAkE5B"}
|
|
@@ -7,7 +7,7 @@ const promises_1 = require("fs/promises");
|
|
|
7
7
|
const os_1 = require("os");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const util_1 = require("util");
|
|
10
|
-
const
|
|
10
|
+
const secrets_1 = require("../../../../../secrets");
|
|
11
11
|
const github_1 = require("../../../../../utils/github");
|
|
12
12
|
const githubMergeGating_1 = require("../githubMergeGating");
|
|
13
13
|
const execFile = (0, util_1.promisify)(child_process_1.execFile);
|
|
@@ -41,7 +41,7 @@ const setupGithub = async (instance, config) => {
|
|
|
41
41
|
instance.log("⚠️ github cli (gh) not authenticated — skipping github merge-gating setup (run: gh auth login)");
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
|
-
const repo = await (0,
|
|
44
|
+
const repo = await (0, secrets_1.getConfiguredGithubRepo)();
|
|
45
45
|
if (!repo) {
|
|
46
46
|
instance.log(`⚠️ no github repository found on the '${(0, pipeline_1.getPipelineGitRemote)(config, "github")}' remote — skipping github merge-gating setup`);
|
|
47
47
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupGithub.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupGithub.ts"],"names":[],"mappings":";;;AACA,kDAI6B;AAC7B,iDAAuD;AACvD,0CAAoD;AACpD,2BAA4B;AAC5B,+BAA4B;AAC5B,+BAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"setupGithub.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupGithub.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,15 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.setupKubernetes = void 0;
|
|
7
7
|
const pipeline_1 = require("../../../../../../../../packages/pipeline/src/index.js");
|
|
8
|
+
const getProjectConfig_1 = require("../../../../../config/getProjectConfig");
|
|
8
9
|
const child_process_promise_1 = require("child-process-promise");
|
|
10
|
+
const secrets_1 = require("../../../../../secrets");
|
|
9
11
|
const cluster_1 = require("../../../../../utils/cluster");
|
|
10
12
|
const gitlab_1 = require("../../../../../utils/gitlab");
|
|
11
13
|
const ensureNamespace_1 = __importDefault(require("../utils/ensureNamespace"));
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
/**
|
|
15
|
+
* the cluster pulls the images from the gitlab container registry, and
|
|
16
|
+
* a deploy token is how it authenticates there. Nothing to do when the
|
|
17
|
+
* project has no gitlab pipeline (the images live elsewhere then).
|
|
18
|
+
*/
|
|
19
|
+
const ensureGitlabDeployToken = async (instance, config) => {
|
|
20
|
+
if (!config || !(0, pipeline_1.getEnabledPipelineTypes)(config).includes("gitlab")) {
|
|
21
|
+
return;
|
|
17
22
|
}
|
|
18
23
|
const { id: projectId } = await (0, gitlab_1.getProjectInfo)(instance);
|
|
19
24
|
const deploy_tokens = await (0, gitlab_1.doGitlabRequest)(instance, `projects/${projectId}/deploy_tokens`);
|
|
@@ -25,6 +30,14 @@ const setupKubernetes = async (instance, context) => {
|
|
|
25
30
|
scopes: ["read_registry"],
|
|
26
31
|
}, "POST");
|
|
27
32
|
}
|
|
33
|
+
};
|
|
34
|
+
const setupKubernetes = async (instance, context) => {
|
|
35
|
+
var _a;
|
|
36
|
+
const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
|
|
37
|
+
if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) {
|
|
38
|
+
throw new Error("cannot run setupKubernetes on non-kubernetes deployments");
|
|
39
|
+
}
|
|
40
|
+
await ensureGitlabDeployToken(instance, await (0, getProjectConfig_1.getProjectConfig)());
|
|
28
41
|
const fullName = (0, pipeline_1.getFullKubernetesClusterName)(deployConfig.cluster);
|
|
29
42
|
instance.log(`cluster: ${fullName}`);
|
|
30
43
|
await (0, cluster_1.connectToCluster)(fullName);
|
|
@@ -107,8 +120,11 @@ EOF
|
|
|
107
120
|
}
|
|
108
121
|
instance.log("service accounts created / updated!");
|
|
109
122
|
instance.log("");
|
|
110
|
-
instance.log("
|
|
111
|
-
await (0,
|
|
123
|
+
instance.log("storing the cluster credentials...");
|
|
124
|
+
await (0, secrets_1.writeSecretsAndMirror)(instance, [{ env: context.env, componentName: context.name, secrets: vars }],
|
|
125
|
+
// the service account token is recreated on every run — the
|
|
126
|
+
// previous one is worth nothing
|
|
127
|
+
{ backup: false });
|
|
112
128
|
instance.log("done!");
|
|
113
129
|
};
|
|
114
130
|
exports.setupKubernetes = setupKubernetes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export { commandDoctor } from "./project/commandDoctor";
|
|
|
26
26
|
export { commandCiJobOpen, commandCiJobLog } from "./project/commandGitlabCi";
|
|
27
27
|
export { commandProjectRestoreDb } from "./project/commandProjectRestoreDb";
|
|
28
28
|
export { commandSecurityEvaluate } from "./project/commandSecurityEvaluate";
|
|
29
|
+
export { commandMrPin, commandMrUnpin } from "./project/commandMrPin";
|
|
29
30
|
export { commandNamespace } from "./project/k8s/commandNamespace";
|
|
30
31
|
export { commandListPods } from "./project/k8s/commandListPods";
|
|
31
32
|
export { commandGetShell } from "./project/k8s/commandGetShell";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.commandStarwars = exports.commandDadjoke = exports.commandSecurityAuditCreate = exports.commandSecurityAuditEvaluate = exports.commandSecurityAuditCiJob = exports.commandRestoreDb = exports.commandMongoDestroyMember = exports.commandMongoPortForward = exports.commandMongoGetShell = exports.commandTriggerCronjobProject = exports.commandDeleteProject = exports.commandPauseProject = exports.commandDeletePods = exports.commandGetShell = exports.commandListPods = exports.commandNamespace = exports.commandSecurityEvaluate = exports.commandProjectRestoreDb = exports.commandCiJobLog = exports.commandCiJobOpen = exports.commandDoctor = exports.commandSetup = exports.commandGetMyTotalWorktime = exports.commandRenewToken = exports.commandTriggerCronjobGeneral = exports.commandOpenLogs = exports.commandSecretsSyncGithub = exports.commandSecretsClearBackups = exports.commandSecretsList = exports.commandSecretsSet = exports.commandSecretsPush = exports.commandSecretsPull = exports.commandConfigSecrets = exports.commandCloudSqlProxy = exports.commandOpenGit = exports.commandOpenEnv = exports.commandPortForward = exports.commandEnvVars = exports.commandKubePortForward = exports.commandKubeGetShell = exports.commandKubeStopPortforward = exports.commandKubeListPods = exports.commandKubeListSecrets = exports.commandKubeListNamespaces = exports.commandKubeCurrentContext = void 0;
|
|
3
|
+
exports.commandStarwars = exports.commandDadjoke = exports.commandSecurityAuditCreate = exports.commandSecurityAuditEvaluate = exports.commandSecurityAuditCiJob = exports.commandRestoreDb = exports.commandMongoDestroyMember = exports.commandMongoPortForward = exports.commandMongoGetShell = exports.commandTriggerCronjobProject = exports.commandDeleteProject = exports.commandPauseProject = exports.commandDeletePods = exports.commandGetShell = exports.commandListPods = exports.commandNamespace = exports.commandMrUnpin = exports.commandMrPin = exports.commandSecurityEvaluate = exports.commandProjectRestoreDb = exports.commandCiJobLog = exports.commandCiJobOpen = exports.commandDoctor = exports.commandSetup = exports.commandGetMyTotalWorktime = exports.commandRenewToken = exports.commandTriggerCronjobGeneral = exports.commandOpenLogs = exports.commandSecretsSyncGithub = exports.commandSecretsClearBackups = exports.commandSecretsList = exports.commandSecretsSet = exports.commandSecretsPush = exports.commandSecretsPull = exports.commandConfigSecrets = exports.commandCloudSqlProxy = exports.commandOpenGit = exports.commandOpenEnv = exports.commandPortForward = exports.commandEnvVars = exports.commandKubePortForward = exports.commandKubeGetShell = exports.commandKubeStopPortforward = exports.commandKubeListPods = exports.commandKubeListSecrets = exports.commandKubeListNamespaces = exports.commandKubeCurrentContext = void 0;
|
|
4
4
|
// General commands
|
|
5
5
|
var commandKubeCurrentContext_1 = require("./general/commandKubeCurrentContext");
|
|
6
6
|
Object.defineProperty(exports, "commandKubeCurrentContext", { enumerable: true, get: function () { return commandKubeCurrentContext_1.commandKubeCurrentContext; } });
|
|
@@ -60,6 +60,9 @@ var commandProjectRestoreDb_1 = require("./project/commandProjectRestoreDb");
|
|
|
60
60
|
Object.defineProperty(exports, "commandProjectRestoreDb", { enumerable: true, get: function () { return commandProjectRestoreDb_1.commandProjectRestoreDb; } });
|
|
61
61
|
var commandSecurityEvaluate_1 = require("./project/commandSecurityEvaluate");
|
|
62
62
|
Object.defineProperty(exports, "commandSecurityEvaluate", { enumerable: true, get: function () { return commandSecurityEvaluate_1.commandSecurityEvaluate; } });
|
|
63
|
+
var commandMrPin_1 = require("./project/commandMrPin");
|
|
64
|
+
Object.defineProperty(exports, "commandMrPin", { enumerable: true, get: function () { return commandMrPin_1.commandMrPin; } });
|
|
65
|
+
Object.defineProperty(exports, "commandMrUnpin", { enumerable: true, get: function () { return commandMrPin_1.commandMrUnpin; } });
|
|
63
66
|
// Project k8s commands
|
|
64
67
|
var commandNamespace_1 = require("./project/k8s/commandNamespace");
|
|
65
68
|
Object.defineProperty(exports, "commandNamespace", { enumerable: true, get: function () { return commandNamespace_1.commandNamespace; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,2EAA0E;AAAjE,gIAAA,sBAAsB,OAAA;AAC/B,qEAAoE;AAA3D,0HAAA,mBAAmB,OAAA;AAC5B,mFAAkF;AAAzE,wIAAA,0BAA0B,OAAA;AACnC,qEAAoE;AAA3D,0HAAA,mBAAmB,OAAA;AAC5B,2EAA0E;AAAjE,gIAAA,sBAAsB,OAAA;AAE/B,mBAAmB;AACnB,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,mEAAkE;AAAzD,wHAAA,kBAAkB,OAAA;AAC3B,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,uEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,uEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,yEAAwE;AAA/D,sHAAA,iBAAiB,OAAA;AAC1B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,mFAAkF;AAAzE,wIAAA,0BAA0B,OAAA;AACnC,+EAA8E;AAArE,oIAAA,wBAAwB,OAAA;AACjC,6DAA4D;AAAnD,kHAAA,eAAe,OAAA;AACxB,6EAAmF;AAA1E,qIAAA,4BAA4B,OAAA;AACrC,iEAAgE;AAAvD,sHAAA,iBAAiB,OAAA;AAC1B,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AACrB,yDAAwD;AAA/C,8GAAA,aAAa,OAAA;AACtB,6DAA8E;AAArE,mHAAA,gBAAgB,OAAA;AAAE,kHAAA,eAAe,OAAA;AAC1C,6EAA4E;AAAnE,kIAAA,uBAAuB,OAAA;AAChC,6EAA4E;AAAnE,kIAAA,uBAAuB,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/commands/index.ts"],"names":[],"mappings":";;;AAAA,mBAAmB;AACnB,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,2EAA0E;AAAjE,gIAAA,sBAAsB,OAAA;AAC/B,qEAAoE;AAA3D,0HAAA,mBAAmB,OAAA;AAC5B,mFAAkF;AAAzE,wIAAA,0BAA0B,OAAA;AACnC,qEAAoE;AAA3D,0HAAA,mBAAmB,OAAA;AAC5B,2EAA0E;AAAjE,gIAAA,sBAAsB,OAAA;AAE/B,mBAAmB;AACnB,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,mEAAkE;AAAzD,wHAAA,kBAAkB,OAAA;AAC3B,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,2DAA0D;AAAjD,gHAAA,cAAc,OAAA;AACvB,uEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,uEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,yEAAwE;AAA/D,sHAAA,iBAAiB,OAAA;AAC1B,2EAA0E;AAAjE,wHAAA,kBAAkB,OAAA;AAC3B,mFAAkF;AAAzE,wIAAA,0BAA0B,OAAA;AACnC,+EAA8E;AAArE,oIAAA,wBAAwB,OAAA;AACjC,6DAA4D;AAAnD,kHAAA,eAAe,OAAA;AACxB,6EAAmF;AAA1E,qIAAA,4BAA4B,OAAA;AACrC,iEAAgE;AAAvD,sHAAA,iBAAiB,OAAA;AAC1B,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAClC,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AACrB,yDAAwD;AAA/C,8GAAA,aAAa,OAAA;AACtB,6DAA8E;AAArE,mHAAA,gBAAgB,OAAA;AAAE,kHAAA,eAAe,OAAA;AAC1C,6EAA4E;AAAnE,kIAAA,uBAAuB,OAAA;AAChC,6EAA4E;AAAnE,kIAAA,uBAAuB,OAAA;AAChC,uDAAsE;AAA7D,4GAAA,YAAY,OAAA;AAAE,8GAAA,cAAc,OAAA;AAErC,uBAAuB;AACvB,mEAAkE;AAAzD,oHAAA,gBAAgB,OAAA;AACzB,iEAAgE;AAAvD,kHAAA,eAAe,OAAA;AACxB,iEAAgE;AAAvD,kHAAA,eAAe,OAAA;AACxB,qEAAoE;AAA3D,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,0HAAA,mBAAmB,OAAA;AAC5B,2EAA0E;AAAjE,4HAAA,oBAAoB,OAAA;AAC7B,6EAAmF;AAA1E,qIAAA,4BAA4B,OAAA;AAErC,mBAAmB;AACnB,uEAAsE;AAA7D,4HAAA,oBAAoB,OAAA;AAC7B,6EAA4E;AAAnE,kIAAA,uBAAuB,OAAA;AAChC,iFAAgF;AAAvE,sIAAA,yBAAyB,OAAA;AAElC,oBAAoB;AACpB,gEAA+D;AAAtD,oHAAA,gBAAgB,OAAA;AAEzB,oBAAoB;AACpB,kFAAiF;AAAxE,sIAAA,yBAAyB,OAAA;AAClC,wFAAuF;AAA9E,4IAAA,4BAA4B,OAAA;AACrC,oFAAmF;AAA1E,wIAAA,0BAA0B,OAAA;AAEnC,eAAe;AACf,uDAAsD;AAA7C,gHAAA,cAAc,OAAA;AACvB,yDAAwD;AAA/C,kHAAA,eAAe,OAAA"}
|
|
@@ -5,6 +5,7 @@ const common_tags_1 = require("common-tags");
|
|
|
5
5
|
const defineCommand_1 = require("../../core/defineCommand");
|
|
6
6
|
const editAsFile_1 = require("../../utils/editAsFile");
|
|
7
7
|
const promise_1 = require("../../utils/promise");
|
|
8
|
+
const secrets_1 = require("../../secrets");
|
|
8
9
|
const document_1 = require("./secrets/document");
|
|
9
10
|
const scope_1 = require("./secrets/scope");
|
|
10
11
|
const parseKeysInput_1 = require("./secrets/parseKeysInput");
|
|
@@ -67,7 +68,7 @@ exports.commandConfigSecrets = (0, defineCommand_1.defineCommand)({
|
|
|
67
68
|
ctx.log("⏭️ these secrets are still unset and will not be written:");
|
|
68
69
|
skipped.forEach((entry) => ctx.log(` - ${entry}`));
|
|
69
70
|
}
|
|
70
|
-
await (0,
|
|
71
|
+
await (0, secrets_1.writeSecretsAndMirror)(ctx, writes);
|
|
71
72
|
ctx.log("done! 😻");
|
|
72
73
|
ctx.log("");
|
|
73
74
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../../src/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,4DAAyD;AACzD,uDAAoD;AACpD,iDAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../../src/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export declare const commandMrPin: import("../../core/types").CommandDef<{
|
|
2
|
+
readonly mr: {
|
|
3
|
+
readonly type: "number";
|
|
4
|
+
readonly message: "merge request IID (defaults to the open MR of the current branch)";
|
|
5
|
+
readonly positional: true;
|
|
6
|
+
readonly required: false;
|
|
7
|
+
};
|
|
8
|
+
readonly pipeline: {
|
|
9
|
+
readonly type: "boolean";
|
|
10
|
+
readonly message: "trigger a merge-request pipeline so the pin takes effect immediately";
|
|
11
|
+
readonly required: false;
|
|
12
|
+
};
|
|
13
|
+
}>;
|
|
14
|
+
export declare const commandMrUnpin: import("../../core/types").CommandDef<{
|
|
15
|
+
readonly mr: {
|
|
16
|
+
readonly type: "number";
|
|
17
|
+
readonly message: "merge request IID (defaults to the open MR of the current branch)";
|
|
18
|
+
readonly positional: true;
|
|
19
|
+
readonly required: false;
|
|
20
|
+
};
|
|
21
|
+
}>;
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.commandMrUnpin = exports.commandMrPin = void 0;
|
|
4
|
+
const child_process_promise_1 = require("child-process-promise");
|
|
5
|
+
const pipeline_1 = require("../../../../../packages/pipeline/src/index.js");
|
|
6
|
+
const getProjectConfig_1 = require("../../config/getProjectConfig");
|
|
7
|
+
const defineCommand_1 = require("../../core/defineCommand");
|
|
8
|
+
const gitlab_1 = require("../../utils/gitlab");
|
|
9
|
+
const PIN_LABEL_COLOR = "#428fdc";
|
|
10
|
+
/**
|
|
11
|
+
* the configured pin label — errors when the project cannot pin
|
|
12
|
+
* (github-only, or pinning disabled)
|
|
13
|
+
*/
|
|
14
|
+
const getPinLabel = async () => {
|
|
15
|
+
const config = await (0, getProjectConfig_1.getProjectConfig)();
|
|
16
|
+
if (!config) {
|
|
17
|
+
throw new Error("no catladder config found");
|
|
18
|
+
}
|
|
19
|
+
if (!(0, pipeline_1.getEnabledPipelineTypes)(config).includes("gitlab")) {
|
|
20
|
+
throw new Error("pinning review apps needs the gitlab pipeline — github has no auto-stop, review apps live until the pull request is closed");
|
|
21
|
+
}
|
|
22
|
+
const { pinLabel } = (0, pipeline_1.getAutoStopConfig)(config);
|
|
23
|
+
if (pinLabel === false) {
|
|
24
|
+
throw new Error("review-app pinning is disabled in this project (autoStop.pinLabel: false)");
|
|
25
|
+
}
|
|
26
|
+
return pinLabel;
|
|
27
|
+
};
|
|
28
|
+
const findMr = async (io, projectId, mrIid) => {
|
|
29
|
+
if (mrIid) {
|
|
30
|
+
return (0, gitlab_1.doGitlabRequest)(io, `projects/${projectId}/merge_requests/${mrIid}`);
|
|
31
|
+
}
|
|
32
|
+
const branch = (await (0, child_process_promise_1.exec)("git rev-parse --abbrev-ref HEAD")).stdout.trim();
|
|
33
|
+
const mrs = await (0, gitlab_1.doGitlabRequest)(io, `projects/${projectId}/merge_requests?state=opened&source_branch=${encodeURIComponent(branch)}`);
|
|
34
|
+
if (!(mrs === null || mrs === void 0 ? void 0 : mrs.length)) {
|
|
35
|
+
throw new Error(`no open merge request found for branch '${branch}' — pass one with --mr <iid>`);
|
|
36
|
+
}
|
|
37
|
+
return mrs[0];
|
|
38
|
+
};
|
|
39
|
+
const ensurePinLabelExists = async (io, projectId, pinLabel) => {
|
|
40
|
+
const existing = await (0, gitlab_1.doGitlabRequest)(io, `projects/${projectId}/labels?search=${encodeURIComponent(pinLabel)}`);
|
|
41
|
+
if (existing === null || existing === void 0 ? void 0 : existing.some((label) => label.name === pinLabel)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
await (0, gitlab_1.doGitlabRequest)(io, `projects/${projectId}/labels`, {
|
|
45
|
+
name: pinLabel,
|
|
46
|
+
color: PIN_LABEL_COLOR,
|
|
47
|
+
description: "review apps of this MR are pinned — deploys use auto_stop_in: never (managed by catladder)",
|
|
48
|
+
}, "POST");
|
|
49
|
+
io.log(`created the '${pinLabel}' label in the project`);
|
|
50
|
+
};
|
|
51
|
+
exports.commandMrPin = (0, defineCommand_1.defineCommand)({
|
|
52
|
+
name: "mr pin",
|
|
53
|
+
description: "pin the review apps of a merge request (disable their auto-stop) by adding the pin label; merging or closing the MR still stops them",
|
|
54
|
+
group: "mr",
|
|
55
|
+
inputs: {
|
|
56
|
+
mr: {
|
|
57
|
+
type: "number",
|
|
58
|
+
message: "merge request IID (defaults to the open MR of the current branch)",
|
|
59
|
+
positional: true,
|
|
60
|
+
required: false,
|
|
61
|
+
},
|
|
62
|
+
pipeline: {
|
|
63
|
+
type: "boolean",
|
|
64
|
+
message: "trigger a merge-request pipeline so the pin takes effect immediately",
|
|
65
|
+
required: false,
|
|
66
|
+
},
|
|
67
|
+
},
|
|
68
|
+
execute: async (ctx) => {
|
|
69
|
+
var _a, _b;
|
|
70
|
+
const pinLabel = await getPinLabel();
|
|
71
|
+
const { id: projectId } = await (0, gitlab_1.getProjectInfo)(ctx);
|
|
72
|
+
const mr = await findMr(ctx, projectId, await ctx.get("mr"));
|
|
73
|
+
await ensurePinLabelExists(ctx, projectId, pinLabel);
|
|
74
|
+
if ((_a = mr.labels) === null || _a === void 0 ? void 0 : _a.includes(pinLabel)) {
|
|
75
|
+
ctx.log(`already pinned: mr!${mr.iid} carries the '${pinLabel}' label`);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
await (0, gitlab_1.doGitlabRequest)(ctx, `projects/${projectId}/merge_requests/${mr.iid}`, { add_labels: pinLabel }, "PUT");
|
|
79
|
+
ctx.log(`📌 pinned mr!${mr.iid} "${mr.title}" — label '${pinLabel}' added`);
|
|
80
|
+
}
|
|
81
|
+
// the label only affects pipelines created after it was set, so
|
|
82
|
+
// trigger one — otherwise the currently deployed review apps keep
|
|
83
|
+
// their old auto-stop timer until the next push
|
|
84
|
+
if ((_b = (await ctx.get("pipeline"))) !== null && _b !== void 0 ? _b : true) {
|
|
85
|
+
const pipeline = await (0, gitlab_1.doGitlabRequest)(ctx, `projects/${projectId}/merge_requests/${mr.iid}/pipelines`, {}, "POST");
|
|
86
|
+
ctx.log(`🚀 triggered a pipeline so the pin takes effect now: ${pipeline.web_url}`);
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
ctx.log("the pin takes effect with the next pipeline of the MR");
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
exports.commandMrUnpin = (0, defineCommand_1.defineCommand)({
|
|
94
|
+
name: "mr unpin",
|
|
95
|
+
description: "unpin the review apps of a merge request — the auto-stop timer re-arms with the next deploy",
|
|
96
|
+
group: "mr",
|
|
97
|
+
inputs: {
|
|
98
|
+
mr: {
|
|
99
|
+
type: "number",
|
|
100
|
+
message: "merge request IID (defaults to the open MR of the current branch)",
|
|
101
|
+
positional: true,
|
|
102
|
+
required: false,
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
execute: async (ctx) => {
|
|
106
|
+
var _a;
|
|
107
|
+
const pinLabel = await getPinLabel();
|
|
108
|
+
const { id: projectId } = await (0, gitlab_1.getProjectInfo)(ctx);
|
|
109
|
+
const mr = await findMr(ctx, projectId, await ctx.get("mr"));
|
|
110
|
+
if (!((_a = mr.labels) === null || _a === void 0 ? void 0 : _a.includes(pinLabel))) {
|
|
111
|
+
ctx.log(`mr!${mr.iid} is not pinned (no '${pinLabel}' label)`);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
await (0, gitlab_1.doGitlabRequest)(ctx, `projects/${projectId}/merge_requests/${mr.iid}`, { remove_labels: pinLabel }, "PUT");
|
|
115
|
+
ctx.log(`unpinned mr!${mr.iid} — label '${pinLabel}' removed`);
|
|
116
|
+
ctx.log("the deployed review apps stay pinned until the next deploy re-arms their auto-stop timer");
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
//# sourceMappingURL=commandMrPin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"commandMrPin.js","sourceRoot":"","sources":["../../../../../../src/commands/project/commandMrPin.ts"],"names":[],"mappings":"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"}
|