@catladder/pipeline 4.2.0 → 4.2.2
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/bash/bashEscape.js +1 -1
- package/dist/bash/getInjectVarsScript.js +2 -2
- package/dist/build/artifacts/createBuildJobArtifact.js +2 -2
- package/dist/build/base/createAppBuildJob.js +2 -2
- package/dist/build/base/writeDotEnv.js +2 -2
- package/dist/build/docker.js +2 -2
- package/dist/build/node/cache.js +2 -2
- package/dist/config/readConfig.js +6 -7
- package/dist/constants.js +1 -1
- package/dist/context/createComponentContext.js +2 -2
- package/dist/context/createWorkspaceContext.js +2 -2
- package/dist/context/getEnvConfig.js +3 -3
- package/dist/context/utils/envVars.js +2 -2
- package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +2 -2
- package/dist/deploy/cloudRun/utils/createArgsString.js +2 -2
- package/dist/deploy/kubernetes/kubeValues.js +2 -2
- package/dist/deploy/kubernetes/mongodb.js +2 -2
- package/dist/pipeline/gitlab/createGitlabJobs.js +7 -7
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/index.js +3 -3
- package/examples/rails-k8s-with-worker-dockerfile.test.ts +1 -1
- package/package.json +5 -7
- package/src/bash/getInjectVarsScript.ts +1 -1
- package/src/build/artifacts/createBuildJobArtifact.ts +1 -1
- package/src/build/base/createAppBuildJob.ts +1 -1
- package/src/build/base/writeDotEnv.ts +1 -1
- package/src/build/docker.ts +1 -1
- package/src/build/node/cache.ts +1 -1
- package/src/config/readConfig.ts +7 -12
- package/src/context/createComponentContext.ts +1 -1
- package/src/context/createWorkspaceContext.ts +1 -1
- package/src/context/getEnvConfig.ts +1 -1
- package/src/context/utils/envVars.ts +1 -1
- package/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.ts +1 -1
- package/src/deploy/cloudRun/utils/createArgsString.ts +1 -1
- package/src/deploy/kubernetes/kubeValues.ts +1 -1
- package/src/deploy/kubernetes/mongodb.ts +1 -1
- package/src/pipeline/gitlab/createGitlabJobs.ts +1 -1
- package/src/utils/index.ts +1 -1
package/dist/bash/bashEscape.js
CHANGED
|
@@ -121,7 +121,7 @@ var escapeForDotEnv = function (value, options) {
|
|
|
121
121
|
exports.escapeForDotEnv = escapeForDotEnv;
|
|
122
122
|
// basically the same thing as above for bash
|
|
123
123
|
// thx chatgpt for this
|
|
124
|
-
var escapeForDotEnvScript = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("escapeForDotEnv", "\n input=\"${1:-$(cat)}\"\n input=\"${input//$'\\n'/\\\\n}\"\n if [[ \"$input\" == *\\\\n* ]]; then\n if [[ \"$input\" == *\\\"* && \"$input\" == *\\'* && \"$input\" == *\\`* ]]; then\n printf \"\\\"%s\\\"\\n\" \"$input\" ".concat(
|
|
124
|
+
var escapeForDotEnvScript = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("escapeForDotEnv", "\n input=\"${1:-$(cat)}\"\n input=\"${input//$'\\n'/\\\\n}\"\n if [[ \"$input\" == *\\\\n* ]]; then\n if [[ \"$input\" == *\\\"* && \"$input\" == *\\'* && \"$input\" == *\\`* ]]; then\n printf \"\\\"%s\\\"\\n\" \"$input\" ".concat(/* fallback to double quotes */"", "\n elif [[ \"$input\" == *\\\"* && \"$input\" == *\\'* ]]; then\n printf \"`%s`\\n\" \"$input\"\n elif [[ \"$input\" == *\\\"* ]]; then\n printf \"'%s'\\n\" \"$input\"\n else\n printf \"\\\"%s\\\"\\n\" \"$input\"\n fi\n else\n printf \"%s\\n\" \"$input\"\n fi\n "));
|
|
125
125
|
var escapeBashExpressionForDotEnv = function (value) {
|
|
126
126
|
return value.transformWithCommand(escapeForDotEnvScript.name).toString();
|
|
127
127
|
};
|
|
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
26
26
|
value: true
|
|
27
27
|
});
|
|
28
28
|
exports.getInjectVarsScript = void 0;
|
|
29
|
-
var
|
|
29
|
+
var lodash_es_1 = require("lodash-es");
|
|
30
30
|
var bashEscape_1 = require("./bashEscape");
|
|
31
31
|
var getInjectVarsScript = function (vars) {
|
|
32
32
|
if (!vars) return [];
|
|
@@ -34,7 +34,7 @@ var getInjectVarsScript = function (vars) {
|
|
|
34
34
|
return Object.entries(vars).filter(function (_a) {
|
|
35
35
|
var _b = __read(_a, 2),
|
|
36
36
|
value = _b[1];
|
|
37
|
-
return !(0,
|
|
37
|
+
return !(0, lodash_es_1.isNil)(value);
|
|
38
38
|
}).map(function (_a) {
|
|
39
39
|
var _b = __read(_a, 2),
|
|
40
40
|
key = _b[0],
|
|
@@ -162,10 +162,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
162
162
|
exports.createBuildJobArtifacts = void 0;
|
|
163
163
|
var path_1 = require("path");
|
|
164
164
|
var types_1 = require("../../types");
|
|
165
|
-
var
|
|
165
|
+
var lodash_es_1 = require("lodash-es");
|
|
166
166
|
var writeDotEnv_1 = require("../base/writeDotEnv");
|
|
167
167
|
var uniqueAndAlphabeticalSort = function (arr) {
|
|
168
|
-
return (0,
|
|
168
|
+
return (0, lodash_es_1.uniq)(arr).sort(function (a, b) {
|
|
169
169
|
return a.localeCompare(b);
|
|
170
170
|
});
|
|
171
171
|
};
|
|
@@ -168,7 +168,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
168
168
|
value: true
|
|
169
169
|
});
|
|
170
170
|
exports.createAppBuildJob = void 0;
|
|
171
|
-
var
|
|
171
|
+
var lodash_es_1 = require("lodash-es");
|
|
172
172
|
var __1 = require("../..");
|
|
173
173
|
var utils_1 = require("../../utils");
|
|
174
174
|
var createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
|
|
@@ -190,7 +190,7 @@ var createAppBuildJob = function (context, _a) {
|
|
|
190
190
|
return __generator(this, function (_e) {
|
|
191
191
|
switch (_e.label) {
|
|
192
192
|
case 0:
|
|
193
|
-
_b =
|
|
193
|
+
_b = lodash_es_1.merge;
|
|
194
194
|
_c = {
|
|
195
195
|
name: constants_1.APP_BUILD_JOB_NAME,
|
|
196
196
|
envMode: "jobPerEnv",
|
|
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
26
26
|
value: true
|
|
27
27
|
});
|
|
28
28
|
exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
|
|
29
|
-
var
|
|
29
|
+
var lodash_es_1 = require("lodash-es");
|
|
30
30
|
var bashEscape_1 = require("../../bash/bashEscape");
|
|
31
31
|
var getBuildInfoVariables_1 = require("../../context/getBuildInfoVariables");
|
|
32
32
|
var gitlab_1 = require("../../utils/gitlab");
|
|
@@ -43,7 +43,7 @@ var writeDotEnv = function (context) {
|
|
|
43
43
|
.filter(function (_a) {
|
|
44
44
|
var _b = __read(_a, 2),
|
|
45
45
|
value = _b[1];
|
|
46
|
-
return !(0,
|
|
46
|
+
return !(0, lodash_es_1.isNil)(value);
|
|
47
47
|
})
|
|
48
48
|
// filter out build variables, since they may interfer with caching like turbo
|
|
49
49
|
// build variables are rarely used anyway and we may treat them differently in the future
|
package/dist/build/docker.js
CHANGED
|
@@ -59,7 +59,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
59
59
|
});
|
|
60
60
|
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;
|
|
61
61
|
var fs_1 = require("fs");
|
|
62
|
-
var
|
|
62
|
+
var lodash_es_1 = require("lodash-es");
|
|
63
63
|
var path_1 = __importDefault(require("path"));
|
|
64
64
|
var deploy_1 = require("../deploy");
|
|
65
65
|
var artifactsRegistry_1 = require("../deploy/cloudRun/artifactsRegistry");
|
|
@@ -145,7 +145,7 @@ var createDockerBuildJobBase = function (context, _a) {
|
|
|
145
145
|
var script = _a.script,
|
|
146
146
|
cache = _a.cache,
|
|
147
147
|
def = __rest(_a, ["script", "cache"]);
|
|
148
|
-
return (0,
|
|
148
|
+
return (0, lodash_es_1.merge)(__assign(__assign({
|
|
149
149
|
name: exports.DOCKER_BUILD_JOB_NAME,
|
|
150
150
|
envMode: "jobPerEnv",
|
|
151
151
|
stage: "build",
|
package/dist/build/node/cache.js
CHANGED
|
@@ -155,7 +155,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
155
155
|
value: true
|
|
156
156
|
});
|
|
157
157
|
exports.getNodeCache = exports.getNodeModulesCache = exports.getYarnCache = void 0;
|
|
158
|
-
var
|
|
158
|
+
var lodash_es_1 = require("lodash-es");
|
|
159
159
|
var path_1 = require("path");
|
|
160
160
|
var slugify_1 = __importDefault(require("slugify"));
|
|
161
161
|
var getYarnCache = function (context_1) {
|
|
@@ -215,7 +215,7 @@ var getNodeModulesCache = function (context_1) {
|
|
|
215
215
|
key: componentIsInWorkspace ? "node-modules-workspace" : (0, slugify_1.default)(context.build.dir) + "-node-modules",
|
|
216
216
|
// 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
|
|
217
217
|
policy: policy,
|
|
218
|
-
paths: __spreadArray([], __read(componentIsInWorkspace ? (0,
|
|
218
|
+
paths: __spreadArray([], __read(componentIsInWorkspace ? (0, lodash_es_1.uniq)(__spreadArray(__spreadArray(["node_modules"], __read((_a = workspaces.map(function (w) {
|
|
219
219
|
return (0, path_1.join)(w.location, "node_modules");
|
|
220
220
|
})) !== null && _a !== void 0 ? _a : []), false), __read(!isClassic ? __spreadArray([".yarn/install-state.gz"], __read((_b = workspaces.map(function (w) {
|
|
221
221
|
return (0, path_1.join)(w.location, ".yarn/install-state.gz");
|
|
@@ -151,10 +151,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
151
151
|
});
|
|
152
152
|
exports.readConfig = void 0;
|
|
153
153
|
var fs_1 = require("fs");
|
|
154
|
-
|
|
155
|
-
var tsx = require("tsx/cjs/api");
|
|
154
|
+
var jiti_1 = require("jiti");
|
|
156
155
|
var yaml_1 = require("yaml");
|
|
157
|
-
// allows us to load ts files
|
|
158
156
|
var fullPath = function (directory, ext) {
|
|
159
157
|
return directory + "/catladder." + ext;
|
|
160
158
|
};
|
|
@@ -164,7 +162,7 @@ var readConfigInternal = function () {
|
|
|
164
162
|
args_1[_i] = arguments[_i];
|
|
165
163
|
}
|
|
166
164
|
return __awaiter(void 0, __spreadArray([], __read(args_1), false), void 0, function (directory) {
|
|
167
|
-
var found, filePath, result, config;
|
|
165
|
+
var found, filePath, jiti, result, config;
|
|
168
166
|
if (directory === void 0) {
|
|
169
167
|
directory = process.cwd();
|
|
170
168
|
}
|
|
@@ -177,10 +175,11 @@ var readConfigInternal = function () {
|
|
|
177
175
|
if (!found) return [3 /*break*/, 3];
|
|
178
176
|
filePath = fullPath(directory, found);
|
|
179
177
|
if (!(found === "ts" || found === "js")) return [3 /*break*/, 2];
|
|
180
|
-
|
|
178
|
+
jiti = (0, jiti_1.createJiti)(directory);
|
|
179
|
+
return [4 /*yield*/, jiti.import(filePath)];
|
|
181
180
|
case 1:
|
|
182
181
|
result = _a.sent();
|
|
183
|
-
config = result.default
|
|
182
|
+
config = result.default || result;
|
|
184
183
|
return [2 /*return*/, {
|
|
185
184
|
path: filePath,
|
|
186
185
|
ext: found,
|
|
@@ -220,7 +219,7 @@ var readConfig = function () {
|
|
|
220
219
|
case 2:
|
|
221
220
|
error_1 = _a.sent();
|
|
222
221
|
console.error("Error reading config in ".concat(directory, ":"), error_1);
|
|
223
|
-
console.error("\nThis may happen due to various reasons:\n - Syntax errors in your catladder.ts file\n -
|
|
222
|
+
console.error("\nThis may happen due to various reasons:\n - Syntax errors in your catladder.ts file\n - The TypeScript loader (jiti) used by catladder needs to understand the syntax in your project.\n If your project uses newer TypeScript/JavaScript syntax, you may need to update catladder.\n - Missing or incorrect dependencies in your project\n - TypeScript configuration issues in your tsconfig.json\n");
|
|
224
223
|
return [2 /*return*/, null];
|
|
225
224
|
case 3:
|
|
226
225
|
return [2 /*return*/];
|
package/dist/constants.js
CHANGED
|
@@ -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 = "v4-2-
|
|
7
|
+
exports.PIPELINE_IMAGE_TAG = "v4-2-2-f9dca625" || "latest";
|
|
8
8
|
exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";
|
|
@@ -160,7 +160,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
160
160
|
value: true
|
|
161
161
|
});
|
|
162
162
|
exports.createComponentContext = void 0;
|
|
163
|
-
var
|
|
163
|
+
var lodash_es_1 = require("lodash-es");
|
|
164
164
|
var build_1 = require("../build");
|
|
165
165
|
var deploy_1 = require("../deploy");
|
|
166
166
|
var packageManager_1 = require("../pipeline/packageManager");
|
|
@@ -267,7 +267,7 @@ var createComponentContext = function (ctx) {
|
|
|
267
267
|
pipelineType: ctx.pipelineType,
|
|
268
268
|
trigger: ctx.trigger
|
|
269
269
|
};
|
|
270
|
-
resolvedCustomJobs = (0,
|
|
270
|
+
resolvedCustomJobs = (0, lodash_es_1.isFunction)(customJobs) ? customJobs(context) : customJobs;
|
|
271
271
|
return [2 /*return*/, __assign(__assign({}, context), {
|
|
272
272
|
customJobs: resolvedCustomJobs
|
|
273
273
|
})];
|
|
@@ -122,7 +122,7 @@ exports.createWorkspaceContext = void 0;
|
|
|
122
122
|
var __1 = require("..");
|
|
123
123
|
var packageManager_1 = require("../pipeline/packageManager");
|
|
124
124
|
var utils_1 = require("../utils");
|
|
125
|
-
var
|
|
125
|
+
var lodash_es_1 = require("lodash-es");
|
|
126
126
|
function createWorkspaceContext(_a) {
|
|
127
127
|
return __awaiter(this, arguments, void 0, function (_b) {
|
|
128
128
|
var workspaceConfigRaw, defaults, workspaceConfig;
|
|
@@ -160,7 +160,7 @@ function createWorkspaceContext(_a) {
|
|
|
160
160
|
return __generator(this, function (_b) {
|
|
161
161
|
switch (_b.label) {
|
|
162
162
|
case 0:
|
|
163
|
-
_a =
|
|
163
|
+
_a = lodash_es_1.uniq;
|
|
164
164
|
return [4 /*yield*/, Promise.all(components.map(function (c) {
|
|
165
165
|
return c.build.getComponentDirs(mode);
|
|
166
166
|
}))];
|
|
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.getEnvConfig = void 0;
|
|
7
|
-
var
|
|
7
|
+
var lodash_es_1 = require("lodash-es");
|
|
8
8
|
var getEnvConfig = function (config, componentName, env) {
|
|
9
9
|
var _a, _b;
|
|
10
10
|
var defaultConfig = config.components[componentName];
|
|
@@ -20,10 +20,10 @@ var getEnvConfig = function (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, function (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") {
|
|
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
26
26
|
value: true
|
|
27
27
|
});
|
|
28
28
|
exports.makeSecretEnvVarMapping = exports.stringListToSecreteEnvVarList = exports.stringifyValues = void 0;
|
|
29
|
-
var
|
|
29
|
+
var lodash_es_1 = require("lodash-es");
|
|
30
30
|
var getEnvironmentVariables_1 = require("../getEnvironmentVariables");
|
|
31
31
|
var BashExpression_1 = require("../../bash/BashExpression");
|
|
32
32
|
var stringifyValues = function (obj) {
|
|
@@ -34,7 +34,7 @@ var stringifyValues = function (obj) {
|
|
|
34
34
|
var _b = __read(_a, 2),
|
|
35
35
|
key = _b[0],
|
|
36
36
|
value = _b[1];
|
|
37
|
-
return [key, (0,
|
|
37
|
+
return [key, (0, lodash_es_1.isObject)(value) ? JSON.stringify(value) : "".concat(value)];
|
|
38
38
|
}));
|
|
39
39
|
};
|
|
40
40
|
exports.stringifyValues = stringifyValues;
|
|
@@ -35,7 +35,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
35
35
|
value: true
|
|
36
36
|
});
|
|
37
37
|
exports.getCloudRunDeployScripts = void 0;
|
|
38
|
-
var
|
|
38
|
+
var lodash_es_1 = require("lodash-es");
|
|
39
39
|
var gitlab_1 = require("../../../utils/gitlab");
|
|
40
40
|
var __1 = require("..");
|
|
41
41
|
var bashYaml_1 = require("../../../bash/bashYaml");
|
|
@@ -52,7 +52,7 @@ var schedules_1 = require("./execute/schedules");
|
|
|
52
52
|
function getCloudRunDeployScripts(context) {
|
|
53
53
|
var _a, _b;
|
|
54
54
|
var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
|
|
55
|
-
var allEnvVars = (0,
|
|
55
|
+
var allEnvVars = (0, lodash_es_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
|
|
56
56
|
return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
|
|
57
57
|
: []), false), __read((0, schedules_1.getCreateScheduleScript)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).filter(function (_a) {
|
|
58
58
|
var _b = __read(_a, 2),
|
|
@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
26
26
|
value: true
|
|
27
27
|
});
|
|
28
28
|
exports.createArgsString = void 0;
|
|
29
|
-
var
|
|
29
|
+
var lodash_es_1 = require("lodash-es");
|
|
30
30
|
/**
|
|
31
31
|
* creates arguments string:
|
|
32
32
|
*
|
|
@@ -46,7 +46,7 @@ var createArgsString = function () {
|
|
|
46
46
|
return Object.entries(argObj).filter(function (_a) {
|
|
47
47
|
var _b = __read(_a, 2),
|
|
48
48
|
value = _b[1];
|
|
49
|
-
return !(0,
|
|
49
|
+
return !(0, lodash_es_1.isNil)(value);
|
|
50
50
|
}).map(function (_a) {
|
|
51
51
|
var _b = __read(_a, 2),
|
|
52
52
|
key = _b[0],
|
|
@@ -44,7 +44,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
44
44
|
value: true
|
|
45
45
|
});
|
|
46
46
|
exports.createKubeValues = void 0;
|
|
47
|
-
var
|
|
47
|
+
var lodash_es_1 = require("lodash-es");
|
|
48
48
|
var utils_1 = require("../../utils");
|
|
49
49
|
var types_1 = require("../types");
|
|
50
50
|
var cloudSql_1 = require("./cloudSql");
|
|
@@ -109,7 +109,7 @@ var createKubeValues = function (context) {
|
|
|
109
109
|
cronjobs = _d.cronjobs,
|
|
110
110
|
rest = __rest(_d, ["application", "jobs", "cronjobs"]);
|
|
111
111
|
var env = (0, kubeEnv_1.createKubeEnv)(context);
|
|
112
|
-
var defaultKubeValues = (0,
|
|
112
|
+
var defaultKubeValues = (0, lodash_es_1.merge)({
|
|
113
113
|
env: env,
|
|
114
114
|
application: createAppConfig(context, application)
|
|
115
115
|
}, (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) : {});
|
|
@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
14
14
|
value: true
|
|
15
15
|
});
|
|
16
16
|
exports.createMongodbBaseConfig = void 0;
|
|
17
|
-
var
|
|
17
|
+
var lodash_es_1 = require("lodash-es");
|
|
18
18
|
var getEnvironmentVariables_1 = require("../../context/getEnvironmentVariables");
|
|
19
19
|
var types_1 = require("../types");
|
|
20
20
|
var getCredentialString = function (context) {
|
|
@@ -41,7 +41,7 @@ var createMongodbUrl = function (context, dbName) {
|
|
|
41
41
|
var queryParams = undefined;
|
|
42
42
|
var hosts = "";
|
|
43
43
|
if ((mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.architecture) === "replicaset") {
|
|
44
|
-
hosts = (0,
|
|
44
|
+
hosts = (0, lodash_es_1.range)(0, (_d = mongodbConfig === null || mongodbConfig === void 0 ? void 0 : mongodbConfig.replicaCount) !== null && _d !== void 0 ? _d : 2).map(function (i) {
|
|
45
45
|
return getMongodbReplicasetHost(context, i);
|
|
46
46
|
}).join(",");
|
|
47
47
|
queryParams = "replicaSet=rs0&authSource=admin";
|
|
@@ -168,7 +168,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
168
168
|
value: true
|
|
169
169
|
});
|
|
170
170
|
exports.createGitlabJobs = exports.makeGitlabJob = exports.GITLAB_ENVIRONMENT_URL_VARIABLE = void 0;
|
|
171
|
-
var
|
|
171
|
+
var lodash_es_1 = require("lodash-es");
|
|
172
172
|
var getInjectVarsScript_1 = require("../../bash/getInjectVarsScript");
|
|
173
173
|
var defaults_1 = require("../../defaults");
|
|
174
174
|
var utils_1 = require("../../utils");
|
|
@@ -228,7 +228,7 @@ var getFullReferencedJobNameFromWorkspace = function (referencedJobName, workspa
|
|
|
228
228
|
});
|
|
229
229
|
};
|
|
230
230
|
var getJobName = function (need) {
|
|
231
|
-
return (0,
|
|
231
|
+
return (0, lodash_es_1.isObject)(need) ? need.job : need;
|
|
232
232
|
};
|
|
233
233
|
var makeGitlabJob = function (context, job, allJobs, baseRules) {
|
|
234
234
|
var _a, _b;
|
|
@@ -315,7 +315,7 @@ var addGitlabEnvironment = function (context, catladderJobEnvironment, job, allJ
|
|
|
315
315
|
// those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
|
|
316
316
|
var dotEnvFile = "gitlab_environment.env";
|
|
317
317
|
var createsJobEnv = !catladderJobEnvironment.action || catladderJobEnvironment.action === "start";
|
|
318
|
-
var artifacts = (0,
|
|
318
|
+
var artifacts = (0, lodash_es_1.merge)((_a = job.artifacts) !== null && _a !== void 0 ? _a : {}, createsJobEnv ? {
|
|
319
319
|
reports: {
|
|
320
320
|
dotenv: dotEnvFile
|
|
321
321
|
}
|
|
@@ -332,7 +332,7 @@ var addGitlabEnvironment = function (context, catladderJobEnvironment, job, allJ
|
|
|
332
332
|
} : {}), on_stop ? {
|
|
333
333
|
on_stop: getFullReferencedJobNameFromComponent(on_stop, name, env, allJobs)
|
|
334
334
|
} : {}), restEnvironment)
|
|
335
|
-
}), !(0,
|
|
335
|
+
}), !(0, lodash_es_1.isEmpty)(artifacts) ? {
|
|
336
336
|
artifacts: artifacts
|
|
337
337
|
} : {}), {
|
|
338
338
|
script: __spreadArray(__spreadArray([], __read((_b = job.script) !== null && _b !== void 0 ? _b : []), false), __read(createsJobEnv ? scriptToAdd : []), false)
|
|
@@ -366,7 +366,7 @@ function getGitlabNeeds(context, job, allJobs) {
|
|
|
366
366
|
}
|
|
367
367
|
function deduplicateNeeds(needs) {
|
|
368
368
|
return needs ? __spreadArray([], __read(new Map(needs.map(function (n) {
|
|
369
|
-
return [(0,
|
|
369
|
+
return [(0, lodash_es_1.isObject)(n) ? n.job : n, n];
|
|
370
370
|
})).values()), false) : undefined;
|
|
371
371
|
}
|
|
372
372
|
function getGitlabNeedsForComponentJob(context, _a, allJobs) {
|
|
@@ -416,7 +416,7 @@ function getGitlabNeedsForComponentJob(context, _a, allJobs) {
|
|
|
416
416
|
var cleanedNeeds = __spreadArray(__spreadArray([], __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false), __read(needs !== null && needs !== void 0 ? needs : []), false);
|
|
417
417
|
return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
|
|
418
418
|
var _a;
|
|
419
|
-
return (0,
|
|
419
|
+
return (0, lodash_es_1.isObject)(n) ? "workspaceName" in n ? {
|
|
420
420
|
job: getFullReferencedJobNameFromWorkspace(n.job, n.workspaceName, context.env, allJobs),
|
|
421
421
|
artifacts: n.artifacts
|
|
422
422
|
} : {
|
|
@@ -457,7 +457,7 @@ function getGitlabNeedsForWorkspaceJob(context, _a, allJobs) {
|
|
|
457
457
|
});
|
|
458
458
|
var cleanedNeeds = __spreadArray(__spreadArray([], __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false), __read(needs !== null && needs !== void 0 ? needs : []), false);
|
|
459
459
|
return cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
|
|
460
|
-
return (0,
|
|
460
|
+
return (0, lodash_es_1.isObject)(n) ? {
|
|
461
461
|
job: getFullReferencedJobNameFromWorkspace(n.job, "workspaceName" in n && n.workspaceName ? n.workspaceName : context.name, context.env, allJobs),
|
|
462
462
|
artifacts: n.artifacts
|
|
463
463
|
} : getFullReferencedJobNameFromWorkspace(n, context.name, context.env, allJobs);
|