@catladder/cli 0.0.0-main-4f40fed0 → 0.0.0-main-abafbe9e
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/bundles/catenv/index.js +38852 -33345
- package/dist/bundles/cli/index.js +87503 -82007
- package/dist/cli/src/apps/cli/commands/project/commandConfigSecrets.js +3 -3
- package/dist/cli/src/apps/cli/commands/project/commandConfigSecrets.js.map +1 -1
- package/dist/cli/src/commands/project/commandGitlabCi.js +2 -2
- package/dist/cli/src/commands/project/commandGitlabCi.js.map +1 -1
- package/dist/cli/src/commands/project/k8s/commandListPods.js +2 -2
- package/dist/cli/src/commands/project/k8s/commandListPods.js.map +1 -1
- package/dist/cli/src/utils/gitlab.js +3 -3
- package/dist/cli/src/utils/gitlab.js.map +1 -1
- package/dist/pipeline/src/bash/getInjectVarsScript.js +2 -2
- package/dist/pipeline/src/bash/getInjectVarsScript.js.map +1 -1
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js +2 -2
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js.map +1 -1
- package/dist/pipeline/src/build/base/createAppBuildJob.js +2 -2
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +2 -2
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +2 -2
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.js +2 -2
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/constants.js +1 -1
- package/dist/pipeline/src/context/createComponentContext.js +2 -2
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/createWorkspaceContext.js +2 -2
- package/dist/pipeline/src/context/createWorkspaceContext.js.map +1 -1
- package/dist/pipeline/src/context/getEnvConfig.js +3 -3
- package/dist/pipeline/src/context/getEnvConfig.js.map +1 -1
- package/dist/pipeline/src/context/utils/envVars.js +2 -2
- package/dist/pipeline/src/context/utils/envVars.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/utils/createArgsString.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/utils/createArgsString.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +2 -2
- package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js +2 -2
- package/dist/pipeline/src/deploy/kubernetes/mongodb.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +7 -7
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/utils/index.js +3 -3
- package/dist/pipeline/src/utils/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/apps/cli/commands/project/commandConfigSecrets.ts +1 -1
- package/src/commands/project/commandGitlabCi.ts +1 -1
- package/src/commands/project/k8s/commandListPods.ts +1 -1
- package/src/utils/gitlab.ts +1 -1
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.projectConfigSecrets = void 0;
|
|
7
7
|
const pipeline_1 = require("../../../../../../pipeline/src/index.js");
|
|
8
8
|
const common_tags_1 = require("common-tags");
|
|
9
|
-
const
|
|
9
|
+
const lodash_es_1 = require("lodash-es");
|
|
10
10
|
const getProjectConfig_1 = require("../../../../config/getProjectConfig");
|
|
11
11
|
const editAsFile_1 = require("../../../../utils/editAsFile");
|
|
12
12
|
const gitlab_1 = require("../../../../utils/gitlab");
|
|
@@ -60,8 +60,8 @@ const doItFor = async (instance, envAndComponents) => {
|
|
|
60
60
|
const usedKeys = valuesToEdit[componentName][env] ? Object.keys(valuesToEdit[componentName][env]) : [];
|
|
61
61
|
// check whether newValues have the exact number of keys
|
|
62
62
|
const secretEnvVarKeys = await getSecretEnvVarKeysToConfigure(env, componentName);
|
|
63
|
-
const extranous = (0,
|
|
64
|
-
const missing = (0,
|
|
63
|
+
const extranous = (0, lodash_es_1.difference)(usedKeys, secretEnvVarKeys);
|
|
64
|
+
const missing = (0, lodash_es_1.difference)(secretEnvVarKeys, usedKeys);
|
|
65
65
|
if (extranous.length > 0 || missing.length > 0) {
|
|
66
66
|
instance.log("");
|
|
67
67
|
instance.log(`😿 Oh no! There is something wrong with "${componentName}"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AACvD,6CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;AAAA,kDAAuD;AACvD,6CAA2C;AAC3C,yCAAuC;AAEvC,0EAO6C;AAC7C,6DAA0D;AAC1D,qDAA8D;AAC9D,uDAAkD;AAOlD,+FAA+F;AAC/F,MAAM,WAAW,GAAG,CAAC,CAAO,EAAE,EAAE,CAC9B,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;IAC9C,OAAO;QACL,aAAa;QACb,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YAC3C,GAAG;YACH,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC3C,IAAI,CAAC;oBACH,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBAClC,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CACH;SACF,CAAC,CACH;KACF,CAAC;AACJ,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,8BAA8B,GAAG,KAAK,EAC1C,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,MAAM,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,iCAAc,EAC5D,GAAG,EACH,aAAa,CACd,CAAC;IACF,OAAO;QACL,GAAG,WAAW,CAAC,KAAK,CAAC,gBAAgB;QACrC,GAAG,WAAW,CAAC,MAAM,CAAC,gBAAgB;QACtC,GAAG,gBAAgB;KACpB;SACE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;SACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC;AACF,MAAM,gBAAgB,GAAG,KAAK,EAC5B,QAAY,EACZ,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAC3D,GAAG,EACH,aAAa,CACd,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAkB,EAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,MAAM,IAAA,4CAAyB,EACpD,QAAQ,EACR,GAAG,EACH,aAAa,CACd,CAAC;IACF,MAAM,UAAU,GAAG;QACjB,GAAG,aAAa;QAChB,GAAG,cAAc;KAClB,CAAC;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAC9B,oHAAoH;QACpH,MAAM,gBAAgB,GACpB,KAAK,KAAK,GAAG,GAAG,IAAA,2BAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAC5D,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AACF,MAAM,OAAO,GAAG,KAAK,EACnB,QAAY,EACZ,gBAEC,EACD,EAAE;IACF,IAAI,YAAY,GAAS,MAAM,CAAC,WAAW,CACzC,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;QACpE,aAAa;QACb,MAAM,CAAC,WAAW,CAChB,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC;YACtB,GAAG;YACH,MAAM,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC;SACrD,CAAC,CACH,CACF;KACF,CAAC,CACH,CACF,CAAC;IACF,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,OAAO,SAAS,EAAE,CAAC;QACjB,YAAY,GAAG,MAAM,IAAA,uBAAU,EAC7B,WAAW,CAAC,YAAY,CAAC,EACzB,IAAA,0BAAY,EAAA;;;UAGR,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;aAC/B,GAAG,CACF,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK,aAAa,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpE;aACA,IAAI,CAAC,IAAI,CAAC;;SAEZ,CACJ,CAAC;QACF,mBAAmB;QACnB,SAAS,GAAG,KAAK,CAAC;QAClB,KAAK,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACrE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC;oBAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC/C,CAAC,CAAC,EAAE,CAAC;gBACP,wDAAwD;gBACxD,MAAM,gBAAgB,GAAG,MAAM,8BAA8B,CAC3D,GAAG,EACH,aAAa,CACd,CAAC;gBAEF,MAAM,SAAS,GAAG,IAAA,sBAAU,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACzD,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;gBAEvD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC/C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACjB,QAAQ,CAAC,GAAG,CACV,4CAA4C,aAAa,GAAG,CAC7D,CAAC;oBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACjB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACzB,QAAQ,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;wBAC7D,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC9C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACnB,CAAC;oBACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wBACvB,QAAQ,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;wBACtD,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC5C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACnB,CAAC;oBAED,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;oBAClB,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;oBAE/D,IAAI,CAAC,cAAc,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC3B,CAAC;oBACD,SAAS,GAAG,IAAI,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,QAAQ,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;IACxD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjB,KAAK,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrE,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,QAAQ,CAAC,GAAG,CAAC,YAAY,GAAG,GAAG,GAAG,GAAG,GAAG,aAAa,GAAG,OAAO,CAAC,CAAC;YACjE,MAAM,IAAA,2BAAkB,EACtB,QAAQ,EACR,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,EAChC,GAAG,EACH,aAAa,CACd,CAAC;YACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACjB,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC;YAC/C,QAAQ,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IACD,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACnB,CAAC,CAAC;AAEK,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAM,EAAE,YAAqB,EAAE,EAAE;IAC1E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,mBAAmB,GAAG,MAAM,IAAA,0DAAuC,GAAE,CAAC;QAC5E,MAAM,OAAO,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACzC,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;QAEzD,wEAAwE;QACxE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,UAAU,GAAG,MAAM,IAAA,uCAAoB,GAAE,CAAC;YAChD,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,OAAO,CAAC,EAAE,EAAE;gBAChB,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,CAAC;aACvB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,oBAAoB,wBAkB/B"}
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
10
10
|
});
|
|
11
11
|
exports.commandCiJobLog = exports.commandCiJobOpen = void 0;
|
|
12
12
|
const child_process_promise_1 = require("child-process-promise");
|
|
13
|
-
const
|
|
13
|
+
const lodash_es_1 = require("lodash-es");
|
|
14
14
|
const open_1 = __importDefault(require("open"));
|
|
15
15
|
const defineCommand_1 = require("../../core/defineCommand");
|
|
16
16
|
const gitlab_1 = require("../../utils/gitlab");
|
|
@@ -48,7 +48,7 @@ const findJobById = async (io, jobName) => {
|
|
|
48
48
|
id: projectId
|
|
49
49
|
} = await (0, gitlab_1.getProjectInfo)(io);
|
|
50
50
|
const jobs = await (0, gitlab_1.doGitlabRequest)(io, `projects/${projectId}/jobs`);
|
|
51
|
-
const jobId = Number((0,
|
|
51
|
+
const jobId = Number((0, lodash_es_1.last)(jobName.split("-")));
|
|
52
52
|
return {
|
|
53
53
|
job: jobs.find(j => j.id === jobId),
|
|
54
54
|
projectId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandGitlabCi.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandGitlabCi.ts"],"names":[],"mappings":";;;;;;AAAA,iEAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"commandGitlabCi.js","sourceRoot":"","sources":["../../../../../src/commands/project/commandGitlabCi.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.commandListPods = void 0;
|
|
7
7
|
const yaml_1 = require("yaml");
|
|
8
|
-
const
|
|
8
|
+
const lodash_es_1 = require("lodash-es");
|
|
9
9
|
const defineCommand_1 = require("../../../core/defineCommand");
|
|
10
10
|
const kubernetes_1 = require("../../../kubernetes");
|
|
11
11
|
const ensureCluster_1 = require("../../../apps/cli/commands/project/utils/ensureCluster");
|
|
@@ -28,6 +28,6 @@ exports.commandListPods = (0, defineCommand_1.defineCommand)({
|
|
|
28
28
|
const envComponent = await ctx.get("envComponent");
|
|
29
29
|
await (0, ensureCluster_1.ensureCluster)(ctx, envComponent);
|
|
30
30
|
const pods = await (0, kubernetes_1.getProjectPods)(envComponent);
|
|
31
|
-
ctx.log((0, yaml_1.stringify)(pods.map(p => (0,
|
|
31
|
+
ctx.log((0, yaml_1.stringify)(pods.map(p => (0, lodash_es_1.pick)(p, ["metadata.name", "status.startTime"]))));
|
|
32
32
|
}
|
|
33
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandListPods.js","sourceRoot":"","sources":["../../../../../../src/commands/project/k8s/commandListPods.ts"],"names":[],"mappings":";;;AAAA,+BAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"commandListPods.js","sourceRoot":"","sources":["../../../../../../src/commands/project/k8s/commandListPods.ts"],"names":[],"mappings":";;;AAAA,+BAAiC;AACjC,yCAAiC;AACjC,+DAA4D;AAC5D,oDAAqD;AACrD,0FAAuF;AACvF,8FAA4F;AAC5F,qDAAmD;AAEtC,QAAA,eAAe,GAAG,IAAA,6BAAa,EAAC;IAC3C,IAAI,EAAE,uBAAuB;IAC7B,WAAW,EAAE,4BAA4B;IACzC,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,IAAA,4BAAa,EAAC,YAAY,CAAC;IACxC,MAAM,EAAE;QACN,YAAY,EAAE;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAA,kCAAgB,GAAE;SACxC;KACF;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACrB,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,IAAA,6BAAa,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG,MAAM,IAAA,2BAAc,EAAC,YAAY,CAAC,CAAC;QAChD,GAAG,CAAC,GAAG,CACL,IAAA,gBAAS,EACP,IAAI,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAA,gBAAI,EAAC,CAAC,EAAE,CAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC,CAAC,CACrE,CACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
10
10
|
});
|
|
11
11
|
exports.upsertAllVariables = exports.clearBackups = exports.getVariableValueByRawName = exports.getAllVariables = exports.getProjectInfo = exports.doGitlabRequest = exports.getGitlabToken = exports.setupGitlabToken = exports.hasGitlabToken = void 0;
|
|
12
12
|
const pipeline_1 = require("../../../pipeline/src/index.js");
|
|
13
|
-
const
|
|
13
|
+
const lodash_es_1 = require("lodash-es");
|
|
14
14
|
const memoizee_1 = __importDefault(require("memoizee"));
|
|
15
15
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
16
16
|
const open_1 = __importDefault(require("open"));
|
|
@@ -200,8 +200,8 @@ const upsertAllVariables = async (io, variables, env, componentName, backup = tr
|
|
|
200
200
|
const existingVariables = await getAllCatladderEnvVarsInGitlab(io);
|
|
201
201
|
for (const [key, value] of Object.entries(variables !== null && variables !== void 0 ? variables : {})) {
|
|
202
202
|
const fullKey = (0, pipeline_1.getSecretVarName)(env, componentName, key);
|
|
203
|
-
const valueSanitized = (0,
|
|
204
|
-
const exists = (0,
|
|
203
|
+
const valueSanitized = (0, lodash_es_1.isObject)(value) ? JSON.stringify(value) : `${value}`;
|
|
204
|
+
const exists = (0, lodash_es_1.has)(existingVariables, fullKey);
|
|
205
205
|
const oldValue = (_a = existingVariables[fullKey]) === null || _a === void 0 ? void 0 : _a.value;
|
|
206
206
|
const changed = oldValue !== valueSanitized;
|
|
207
207
|
if (changed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"gitlab.js","sourceRoot":"","sources":["../../../../src/utils/gitlab.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getInjectVarsScript = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const bashEscape_1 = require("./bashEscape");
|
|
9
9
|
const getInjectVarsScript = vars => {
|
|
10
10
|
if (!vars) return [];
|
|
11
11
|
// filter out null and undefined values
|
|
12
|
-
return Object.entries(vars).filter(([, value]) => !(0,
|
|
12
|
+
return Object.entries(vars).filter(([, value]) => !(0, lodash_es_1.isNil)(value)).map(([key, value]) => `export ${key}="${value ? (0, bashEscape_1.bashEscape)(value, {
|
|
13
13
|
quotes: "double"
|
|
14
14
|
}) : ""}"`);
|
|
15
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInjectVarsScript.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/getInjectVarsScript.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"getInjectVarsScript.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/getInjectVarsScript.ts"],"names":[],"mappings":";;;AACA,yCAAkC;AAClC,6CAA0C;AAEnC,MAAM,mBAAmB,GAAG,CAAC,IAAyB,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,uCAAuC;IACvC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAK,EAAC,KAAK,CAAC,CAAC;SAEpC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,UAAU,GAAG,KACX,KAAK;QACH,CAAC,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE;YAChB,MAAM,EAAE,QAAQ;SACjB,CAAC;QACJ,CAAC,CAAC,EACN,GAAG,CACN,CAAC;AACN,CAAC,CAAC;AAhBW,QAAA,mBAAmB,uBAgB9B"}
|
|
@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.createBuildJobArtifacts = void 0;
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const types_1 = require("../../types");
|
|
9
|
-
const
|
|
9
|
+
const lodash_es_1 = require("lodash-es");
|
|
10
10
|
const writeDotEnv_1 = require("../base/writeDotEnv");
|
|
11
11
|
const uniqueAndAlphabeticalSort = arr => {
|
|
12
|
-
return (0,
|
|
12
|
+
return (0, lodash_es_1.uniq)(arr).sort((a, b) => a.localeCompare(b));
|
|
13
13
|
};
|
|
14
14
|
const createBuildJobArtifacts = async context => {
|
|
15
15
|
var _a, _b;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBuildJobArtifact.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/artifacts/createBuildJobArtifact.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,uCAIqB;AAErB,
|
|
1
|
+
{"version":3,"file":"createBuildJobArtifact.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/artifacts/createBuildJobArtifact.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.createAppBuildJob = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const __1 = require("../..");
|
|
9
9
|
const utils_1 = require("../../utils");
|
|
10
10
|
const createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
|
|
@@ -21,7 +21,7 @@ const createAppBuildJob = async (context, {
|
|
|
21
21
|
...def
|
|
22
22
|
}) => {
|
|
23
23
|
var _a;
|
|
24
|
-
return (0,
|
|
24
|
+
return (0, lodash_es_1.merge)({
|
|
25
25
|
name: constants_1.APP_BUILD_JOB_NAME,
|
|
26
26
|
envMode: "jobPerEnv",
|
|
27
27
|
stage: "build",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAMlC,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAEhB,MAAM,iBAAiB,GAAG,KAAK,EACpC,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EACrD,EAAE;;IACzB,OAAO,IAAA,iBAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;iBACjD;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,MAAM,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAClD,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,iBAAiB,qBA8C5B"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const bashEscape_1 = require("../../bash/bashEscape");
|
|
9
9
|
const getBuildInfoVariables_1 = require("../../context/getBuildInfoVariables");
|
|
10
10
|
const gitlab_1 = require("../../utils/gitlab");
|
|
@@ -18,7 +18,7 @@ const writeDotEnv = context => {
|
|
|
18
18
|
// make key=value and sanitize multiline
|
|
19
19
|
const keyValueString = Object.entries(envVars)
|
|
20
20
|
// filter out null and undefined values
|
|
21
|
-
.filter(([, value]) => !(0,
|
|
21
|
+
.filter(([, value]) => !(0, lodash_es_1.isNil)(value))
|
|
22
22
|
// filter out build variables, since they may interfer with caching like turbo
|
|
23
23
|
// build variables are rarely used anyway and we may treat them differently in the future
|
|
24
24
|
.filter(([key]) => !getBuildInfoVariables_1.ALL_BUILD_VARIABLES.includes(key)).map(([key, value]) => `${key}=${(0, bashEscape_1.escapeForDotEnv)(value)}`).join("\n");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAClC,sDAAwD;AACxD,+EAA0E;AAE1E,+CAAyD;AAEzD;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5C,wCAAwC;IACxC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5C,uCAAuC;SACtC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAK,EAAC,KAAK,CAAC,CAAC;QACrC,8EAA8E;QAC9E,yFAAyF;SACxF,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,2CAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAErD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,IAAA,4BAAe,EAAC,KAAK,CAAC,EAAE,CAAC;SACzD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,IAAA,4BAAmB,EACxB,eAAe,GAAG,OAAO,CAAC,IAAI,EAC9B,oBAAoB,GAAG,OAAO,CAAC,IAAI,CACpC,CAAC;QACA,eAAe,OAAO,CAAC,KAAK,CAAC,GAAG;EAClC,cAAc;IACZ;KACD,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,WAAW,eAsBtB;AAEK,MAAM,oCAAoC,GAAG,CAClD,OAAyB,EACzB,EAAE;;IACF,OAAO,CAAC,MAAA,OAAO,CAAC,eAAe,CAAC,MAAM,mCAAI,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,kCAAkC;AAC9F,CAAC,CAAC;AAJW,QAAA,oCAAoC,wCAI/C"}
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
10
10
|
});
|
|
11
11
|
exports.hasDockerfile = exports.getDockerBuildDefaultScript = exports.getDockerBuildScriptWithBuiltInDockerFile = exports.gitlabDockerLogin = exports.createDockerBuildJobBase = exports.getDockerJobBaseProps = exports.DOCKER_BUILD_JOB_NAME = exports.getDockerBuildVariables = exports.requiresDockerBuild = exports.getDockerImageVariables = void 0;
|
|
12
12
|
const fs_1 = require("fs");
|
|
13
|
-
const
|
|
13
|
+
const lodash_es_1 = require("lodash-es");
|
|
14
14
|
const path_1 = __importDefault(require("path"));
|
|
15
15
|
const deploy_1 = require("../deploy");
|
|
16
16
|
const artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
|
|
@@ -98,7 +98,7 @@ const createDockerBuildJobBase = (context, {
|
|
|
98
98
|
cache,
|
|
99
99
|
...def
|
|
100
100
|
}) => {
|
|
101
|
-
return (0,
|
|
101
|
+
return (0, lodash_es_1.merge)({
|
|
102
102
|
name: exports.DOCKER_BUILD_JOB_NAME,
|
|
103
103
|
envMode: "jobPerEnv",
|
|
104
104
|
stage: "build",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":";;;;;;AAAA,2BAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
9
9
|
value: true
|
|
10
10
|
});
|
|
11
11
|
exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
12
|
-
const
|
|
12
|
+
const lodash_es_1 = require("lodash-es");
|
|
13
13
|
const path_1 = require("path");
|
|
14
14
|
const slugify_1 = __importDefault(require("slugify"));
|
|
15
15
|
const getYarnCache = async (context, policy = "pull-push") => {
|
|
@@ -41,7 +41,7 @@ const getNodeModulesCache = async (context, policy = "pull-push") => {
|
|
|
41
41
|
key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
|
|
42
42
|
// we use the dirname, not the component name, because in certain cases we have two apps in the same directory and want to share the cache, e.g. when having storybook in the same package.json
|
|
43
43
|
policy,
|
|
44
|
-
paths: [...(componentIsInWorkspace ? (0,
|
|
44
|
+
paths: [...(componentIsInWorkspace ? (0, lodash_es_1.uniq)(["node_modules", ...((_a = workspaces.map(w => (0, path_1.join)(w.location, "node_modules"))) !== null && _a !== void 0 ? _a : []), ...(!isClassic ? [".yarn/install-state.gz", ...((_b = workspaces.map(w => (0, path_1.join)(w.location, ".yarn/install-state.gz"))) !== null && _b !== void 0 ? _b : [])] : [])]) : [(0, path_1.join)(context.build.dir, "node_modules"), ...(!isClassic ? [(0, path_1.join)(context.build.dir, ".yarn/install-state.gz")] : [])])]
|
|
45
45
|
}];
|
|
46
46
|
};
|
|
47
47
|
exports.getNodeModulesCache = getNodeModulesCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
|
|
7
|
-
exports.PIPELINE_IMAGE_TAG = "main-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "main-abafbe9e" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.createComponentContext = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const build_1 = require("../build");
|
|
9
9
|
const deploy_1 = require("../deploy");
|
|
10
10
|
const packageManager_1 = require("../pipeline/packageManager");
|
|
@@ -93,7 +93,7 @@ const createComponentContext = async ctx => {
|
|
|
93
93
|
pipelineType: ctx.pipelineType,
|
|
94
94
|
trigger: ctx.trigger
|
|
95
95
|
};
|
|
96
|
-
const resolvedCustomJobs = (0,
|
|
96
|
+
const resolvedCustomJobs = (0, lodash_es_1.isFunction)(customJobs) ? customJobs(context) : customJobs;
|
|
97
97
|
return {
|
|
98
98
|
...context,
|
|
99
99
|
customJobs: resolvedCustomJobs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createComponentContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createComponentContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.createWorkspaceContext = void 0;
|
|
|
7
7
|
const __1 = require("..");
|
|
8
8
|
const packageManager_1 = require("../pipeline/packageManager");
|
|
9
9
|
const utils_1 = require("../utils");
|
|
10
|
-
const
|
|
10
|
+
const lodash_es_1 = require("lodash-es");
|
|
11
11
|
async function createWorkspaceContext({
|
|
12
12
|
env,
|
|
13
13
|
components,
|
|
@@ -36,7 +36,7 @@ async function createWorkspaceContext({
|
|
|
36
36
|
build: {
|
|
37
37
|
type: "workspace",
|
|
38
38
|
dir: (_b = workspaceConfig.dir) !== null && _b !== void 0 ? _b : ".",
|
|
39
|
-
getComponentDirs: async mode => (0,
|
|
39
|
+
getComponentDirs: async mode => (0, lodash_es_1.uniq)((await Promise.all(components.map(c => c.build.getComponentDirs(mode)))).flat()),
|
|
40
40
|
buildType: workspaceConfig.type,
|
|
41
41
|
config: workspaceConfig
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createWorkspaceContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createWorkspaceContext.ts"],"names":[],"mappings":";;;AAAA,0BAMY;AACZ,+DAAuE;AACvE,oCAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"createWorkspaceContext.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/createWorkspaceContext.ts"],"names":[],"mappings":";;;AAAA,0BAMY;AACZ,+DAAuE;AACvE,oCAAkD;AAClD,yCAAiC;AAE1B,KAAK,UAAU,sBAAsB,CAAC,EAC3C,GAAG,EACH,UAAU,EACV,aAAa,EACb,MAAM,EACN,YAAY,EACZ,OAAO,GAQR;;IACC,MAAM,kBAAkB,GAAG,MAAA,MAAM,CAAC,MAAM,0CAAG,aAAa,CAAC,CAAC;IAC1D,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,aAAa,sBAAsB,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,QAAQ,GAAG,yBAAqB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAE3E,MAAM,eAAe,GAAG,IAAA,8BAAsB,EAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC7E,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,YAAY;QACZ,OAAO;QACP,IAAI,EAAE,WAAW;QAEjB,eAAe;QAEf,GAAG;QACH,UAAU;QACV,UAAU,EAAE,MAAM;QAClB,kBAAkB,EAAE,IAAA,0CAAyB,GAAE;QAC/C,KAAK,EAAE;YACL,IAAI,EAAE,WAAW;YACjB,GAAG,EAAE,MAAA,eAAe,CAAC,GAAG,mCAAI,GAAG;YAC/B,gBAAgB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC/B,IAAA,gBAAI,EACF,CACE,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CACtD,CACF,CAAC,IAAI,EAAE,CACT;YACH,SAAS,EAAE,eAAe,CAAC,IAAI;YAC/B,MAAM,EAAE,eAAe;SACxB;KACF,CAAC;AACJ,CAAC;AAlDD,wDAkDC"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getEnvConfig = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const getEnvConfig = (config, componentName, env) => {
|
|
9
9
|
var _a, _b;
|
|
10
10
|
const defaultConfig = config.components[componentName];
|
|
@@ -20,10 +20,10 @@ const getEnvConfig = (config, componentName, env) => {
|
|
|
20
20
|
* env config is merged with default. Arrays are not merged.
|
|
21
21
|
* you can customize this by providing a function that takes the default value as argument
|
|
22
22
|
*/
|
|
23
|
-
return (0,
|
|
23
|
+
return (0, lodash_es_1.mergeWith)(
|
|
24
24
|
// mergeWith unfortunatly mutates the first object, so we need to clone it.
|
|
25
25
|
// Passing empty object also doesn't work for us, because that will mess with the customizer function (second argument isn't nessecary the customized value)
|
|
26
|
-
(0,
|
|
26
|
+
(0, lodash_es_1.cloneDeep)(defaultConfig), envCustomizations, (defaultValue, customValue, key, obj, source) => {
|
|
27
27
|
// check if custom value is a function (and default is not),
|
|
28
28
|
// we currently don't have config options, that are functions, but we might in the future (customJobs is an exception)
|
|
29
29
|
if (typeof customValue === "function" && typeof defaultValue !== "function") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getEnvConfig.js","sourceRoot":"","sources":["../../../../../pipeline/src/context/getEnvConfig.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AAG1C,MAAM,YAAY,GAAG,CAC1B,MAAc,EACd,aAAqB,EACrB,GAAW,EACa,EAAE;;IAC1B,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAA,MAAA,aAAa,CAAC,GAAG,0CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;IACzD,IAAI,iBAAiB,KAAK,KAAK,EAAE,CAAC;QAChC,mDAAmD;QACnD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD;;;OAGG;IACH,OAAO,IAAA,qBAAS;IACd,2EAA2E;IAC3E,4JAA4J;IAC5J,IAAA,qBAAS,EAAC,aAAa,CAAC,EACxB,iBAAiB,EACjB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;QAC9C,4DAA4D;QAC5D,sHAAsH;QACtH,IACE,OAAO,WAAW,KAAK,UAAU;YACjC,OAAO,YAAY,KAAK,UAAU,EAClC,CAAC;YACD,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AArCW,QAAA,YAAY,gBAqCvB"}
|
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.makeSecretEnvVarMapping = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const getEnvironmentVariables_1 = require("../getEnvironmentVariables");
|
|
9
9
|
const BashExpression_1 = require("../../bash/BashExpression");
|
|
10
|
-
const stringifyValues = obj => Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, (0,
|
|
10
|
+
const stringifyValues = obj => Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, (0, lodash_es_1.isObject)(value) ? JSON.stringify(value) : `${value}`]));
|
|
11
11
|
exports.stringifyValues = stringifyValues;
|
|
12
12
|
const stringListToSecreteEnvVarList = keys => keys.map(key => ({
|
|
13
13
|
key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"envVars.js","sourceRoot":"","sources":["../../../../../../pipeline/src/context/utils/envVars.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,wEAA8D;AAC9D,8DAA4D;AAErD,MAAM,eAAe,GAAG,CAAC,GAA4B,EAAE,EAAE,CAC9D,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IACxC,GAAG;IACH,IAAA,oBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE;CACrD,CAAC,CACH,CAAC;AANS,QAAA,eAAe,mBAMxB;AAEG,MAAM,6BAA6B,GAAG,CAAC,IAAc,EAAkB,EAAE,CAC9E,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;AADlB,QAAA,6BAA6B,iCACX;AACxB,MAAM,uBAAuB,GAAG,CACrC,GAAW,EACX,aAAqB,EACrB,aAA6B,EAC7B,EAAE;IACF,OAAO,MAAM,CAAC,WAAW,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;QAC7B,GAAG;QACH,IAAA,gCAAe,EAAC,IAAA,0CAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KAC3D,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getCloudRunDeployScripts = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const gitlab_1 = require("../../../utils/gitlab");
|
|
9
9
|
const __1 = require("..");
|
|
10
10
|
const bashYaml_1 = require("../../../bash/bashYaml");
|
|
@@ -21,7 +21,7 @@ const schedules_1 = require("./execute/schedules");
|
|
|
21
21
|
function getCloudRunDeployScripts(context) {
|
|
22
22
|
var _a, _b;
|
|
23
23
|
const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
|
|
24
|
-
const allEnvVars = (0,
|
|
24
|
+
const allEnvVars = (0, lodash_es_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
|
|
25
25
|
return [...(0, gitlab_1.collapseableSection)("prepare", "Prepare...")([...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context), ...(0, common_1.setGoogleProjectNumberScript)(deployConfig)]), ...(0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME)), ...(0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")([...(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
|
|
26
26
|
: []), ...(0, schedules_1.getCreateScheduleScript)(context), ...(0, cloudRunJobs_1.getJobCreateScripts)(context), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy"), ...(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(([_, service]) => service !== false && service !== null).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)), ...Object.entries((_b = deployConfig.workerPools) !== null && _b !== void 0 ? _b : {}).filter(([_, workerPool]) => workerPool !== false && workerPool !== null).map(([name, workerPool]) => (0, cloudRunWorkerPools_1.getWorkerPoolDeployScript)(context, workerPool, name)), ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")]), ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))];
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getCloudRunDeployScripts.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts"],"names":[],"mappings":";;;AAAA,yCAAiC;AAEjC,kDAA4D;AAE5D,0BAAmD;AACnD,qDAAmE;AACnE,wCAAmE;AACnE,gDAA4D;AAC5D,kGAA+F;AAC/F,iDAAqD;AACrD,iDAA8D;AAC9D,yDAA4D;AAC5D,+DAAkE;AAClE,qCAGkB;AAClB,2CAAgD;AAChD,mDAA8D;AAM9D,SAAgB,wBAAwB,CAAC,OAAyB;;IAChE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,gBAAI,EACrB,OAAO,CAAC,WAAW,CAAC,OAAO,EAC3B,iCAA6B,CAC9B,CAAC;IAEF,OAAO;QACL,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,YAAY,CACb,CAAC;YACA,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;YAC7C,GAAG,IAAA,qCAA4B,EAAC,YAAY,CAAC;SAC9C,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,wBAAwB,CACzB,CAAC,IAAA,oCAAyB,EAAC,UAAU,EAAE,6BAAiB,CAAC,CAAC;QAE3D,GAAG,IAAA,4BAAmB,EACpB,QAAQ,EACR,qBAAqB,CACtB,CAAC;YACA,GAAG,CAAC,YAAY,CAAC,QAAQ;gBACvB,CAAC,CAAC,IAAA,kCAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC,6DAA6D;gBAC9G,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,IAAA,mCAAuB,EAAC,OAAO,CAAC;YACnC,GAAG,IAAA,kCAAmB,EAAC,OAAO,CAAC;YAC/B,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,WAAW,CAAC;YAEjD,GAAG,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;gBAChC,CAAC,CAAC,CAAC,IAAA,yCAAsB,EAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;gBACzD,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,kBAAkB,mCAAI,EAAE,CAAC;iBACrD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,IAAI,CAAC;iBAC/D,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CACvB,IAAA,yCAAsB,EACpB,OAAO,EACP,OAAsC,EACtC,GAAG,GAAG,IAAI,CACX,CACF;YACH,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,WAAW,mCAAI,EAAE,CAAC;iBAC9C,MAAM,CACL,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,IAAI,CACjE;iBACA,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAC1B,IAAA,+CAAyB,EACvB,OAAO,EACP,UAA4C,EAC5C,IAAI,CACL,CACF;YACH,GAAG,IAAA,mCAAwB,EAAC,OAAO,EAAE,YAAY,CAAC;SACnD,CAAC;QACF,GAAG,IAAA,4BAAmB,EACpB,SAAS,EACT,SAAS,CACV,CACC,IAAA,+CAAqC,EAAC,OAAO,EAAE,YAAY,CAAC,CAC7D;KACF,CAAC;AACJ,CAAC;AA/DD,4DA+DC"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.createArgsString = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
/**
|
|
9
9
|
* creates arguments string:
|
|
10
10
|
*
|
|
@@ -15,7 +15,7 @@ const lodash_1 = require("lodash");
|
|
|
15
15
|
* @param args args record
|
|
16
16
|
* @returns
|
|
17
17
|
*/
|
|
18
|
-
const createArgsString = (...args) => args.map(argObj => Object.entries(argObj).filter(([, value]) => !(0,
|
|
18
|
+
const createArgsString = (...args) => args.map(argObj => Object.entries(argObj).filter(([, value]) => !(0, lodash_es_1.isNil)(value)).map(([key, value]) => {
|
|
19
19
|
if (value === true) {
|
|
20
20
|
return `--${key}`;
|
|
21
21
|
} else if (value === false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createArgsString.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/createArgsString.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createArgsString.js","sourceRoot":"","sources":["../../../../../../../pipeline/src/deploy/cloudRun/utils/createArgsString.ts"],"names":[],"mappings":";;;AAAA,yCAAkC;AAGlC;;;;;;;;;GASG;AACI,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAoB,EAAE,EAAE,CAC1D,IAAI;KACD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACd,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;KACnB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,iBAAK,EAAC,KAAK,CAAC,CAAC;KACpC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;IACpB,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,KAAK,GAAG,EAAE,CAAC;IACpB,CAAC;SAAM,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QAC3B,OAAO,QAAQ,GAAG,EAAE,CAAC;IACvB,CAAC;IACD,OAAO,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;AAC7B,CAAC,CAAC,CACL;KACA,IAAI,EAAE;KACN,IAAI,CAAC,GAAG,CAAC,CAAC;AAfF,QAAA,gBAAgB,oBAed"}
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.createKubeValues = void 0;
|
|
7
|
-
const
|
|
7
|
+
const lodash_es_1 = require("lodash-es");
|
|
8
8
|
const utils_1 = require("../../utils");
|
|
9
9
|
const types_1 = require("../types");
|
|
10
10
|
const cloudSql_1 = require("./cloudSql");
|
|
@@ -69,7 +69,7 @@ const createKubeValues = context => {
|
|
|
69
69
|
...rest
|
|
70
70
|
} = values !== null && values !== void 0 ? values : {};
|
|
71
71
|
const env = (0, kubeEnv_1.createKubeEnv)(context);
|
|
72
|
-
const defaultKubeValues = (0,
|
|
72
|
+
const defaultKubeValues = (0, lodash_es_1.merge)({
|
|
73
73
|
env,
|
|
74
74
|
application: createAppConfig(context, application)
|
|
75
75
|
}, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_c = (_b = deployConfig.values) === null || _b === void 0 ? void 0 : _b.mongodb) === null || _c === void 0 ? void 0 : _c.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
|