@catladder/cli 1.153.1 → 1.154.0
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 +3 -3
- package/dist/bundles/cli/index.js +6 -6
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupCloudRun.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupContext.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js +2 -2
- package/dist/cli/src/apps/cli/commands/project/setup/setupKubernetes.js.map +1 -1
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.js +1 -25
- package/dist/cli/src/apps/cli/commands/project/utils/ensureNamespace.js.map +1 -1
- package/dist/cli/src/gcloud/serviceAccounts.js +3 -3
- package/dist/cli/src/gcloud/serviceAccounts.js.map +1 -1
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.d.ts +3 -0
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js +81 -0
- package/dist/pipeline/src/build/artifacts/createBuildJobArtifact.js.map +1 -0
- package/dist/pipeline/src/build/base/createAppBuildJob.d.ts +3 -3
- package/dist/pipeline/src/build/base/createAppBuildJob.js +14 -13
- package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
- package/dist/pipeline/src/build/base/index.d.ts +6 -2
- package/dist/pipeline/src/build/base/index.js +23 -5
- package/dist/pipeline/src/build/base/index.js.map +1 -1
- package/dist/pipeline/src/build/base/writeDotEnv.js +3 -2
- package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
- package/dist/pipeline/src/build/custom/buildJob.js +2 -12
- package/dist/pipeline/src/build/custom/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/docker.js +6 -6
- package/dist/pipeline/src/build/docker.js.map +1 -1
- package/dist/pipeline/src/build/index.d.ts +14 -5
- package/dist/pipeline/src/build/index.js +23 -3
- package/dist/pipeline/src/build/index.js.map +1 -1
- package/dist/pipeline/src/build/node/buildJob.d.ts +7 -2
- package/dist/pipeline/src/build/node/buildJob.js +44 -42
- package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
- package/dist/pipeline/src/build/node/cache.d.ts +2 -2
- package/dist/pipeline/src/build/node/cache.js +17 -9
- package/dist/pipeline/src/build/node/cache.js.map +1 -1
- package/dist/pipeline/src/build/node/index.d.ts +2 -2
- package/dist/pipeline/src/build/node/index.js.map +1 -1
- package/dist/pipeline/src/build/node/meteor.js +2 -8
- package/dist/pipeline/src/build/node/meteor.js.map +1 -1
- package/dist/pipeline/src/build/node/testJob.d.ts +3 -2
- package/dist/pipeline/src/build/node/testJob.js +10 -3
- package/dist/pipeline/src/build/node/testJob.js.map +1 -1
- package/dist/pipeline/src/build/node/yarn.js +1 -1
- package/dist/pipeline/src/build/node/yarn.js.map +1 -1
- package/dist/pipeline/src/build/rails/build.d.ts +1 -1
- package/dist/pipeline/src/build/rails/build.js +7 -2
- package/dist/pipeline/src/build/rails/build.js.map +1 -1
- package/dist/pipeline/src/build/rails/test.d.ts +1 -1
- package/dist/pipeline/src/build/rails/test.js +5 -0
- package/dist/pipeline/src/build/rails/test.js.map +1 -1
- package/dist/pipeline/src/build/sbom.js +7 -2
- package/dist/pipeline/src/build/sbom.js.map +1 -1
- package/dist/pipeline/src/build/types.d.ts +49 -5
- package/dist/pipeline/src/build/types.js +9 -1
- package/dist/pipeline/src/build/types.js.map +1 -1
- package/dist/pipeline/src/context/createAllComponentsContext.d.ts +8 -0
- package/dist/pipeline/src/context/createAllComponentsContext.js +68 -0
- package/dist/pipeline/src/context/createAllComponentsContext.js.map +1 -0
- package/dist/pipeline/src/context/createComponentContext.d.ts +0 -4
- package/dist/pipeline/src/context/createComponentContext.js +81 -19
- package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
- package/dist/pipeline/src/context/createWorkspaceContext.d.ts +9 -0
- package/dist/pipeline/src/context/createWorkspaceContext.js +86 -0
- package/dist/pipeline/src/context/createWorkspaceContext.js.map +1 -0
- package/dist/pipeline/src/context/getBuildInfoVariables.d.ts +1 -1
- package/dist/pipeline/src/context/getBuildInfoVariables.js.map +1 -1
- package/dist/pipeline/src/context/getEnvironmentContext.d.ts +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +1 -1
- package/dist/pipeline/src/context/getEnvironmentVariables.js +10 -4
- package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
- package/dist/pipeline/src/context/getLabels.js +2 -2
- package/dist/pipeline/src/context/getLabels.js.map +1 -1
- package/dist/pipeline/src/deploy/base/deploy.d.ts +1 -1
- package/dist/pipeline/src/deploy/base/deploy.js +29 -6
- package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js +2 -2
- package/dist/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.d.ts +4 -4
- package/dist/pipeline/src/deploy/cloudRun/createJobs/common.js.map +1 -1
- package/dist/pipeline/src/deploy/cloudRun/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/cloudRun/index.js.map +1 -1
- package/dist/pipeline/src/deploy/custom/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/custom/index.js.map +1 -1
- package/dist/pipeline/src/deploy/dockerTag/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/dockerTag/index.js.map +1 -1
- package/dist/pipeline/src/deploy/index.d.ts +7 -7
- package/dist/pipeline/src/deploy/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/additionalSecretKeys.d.ts +3 -1
- package/dist/pipeline/src/deploy/kubernetes/additionalSecretKeys.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +1 -1
- package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js +1 -1
- package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
- package/dist/pipeline/src/deploy/kubernetes/index.d.ts +2 -2
- package/dist/pipeline/src/deploy/kubernetes/index.js.map +1 -1
- package/dist/pipeline/src/deploy/sbom.d.ts +1 -1
- package/dist/pipeline/src/deploy/sbom.js +6 -3
- package/dist/pipeline/src/deploy/sbom.js.map +1 -1
- package/dist/pipeline/src/pipeline/createAllJobs.d.ts +12 -10
- package/dist/pipeline/src/pipeline/createAllJobs.js +84 -44
- package/dist/pipeline/src/pipeline/createAllJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/createChildPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForComponent.js +3 -4
- package/dist/pipeline/src/pipeline/createJobsForComponent.js.map +1 -1
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.d.ts +3 -0
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.js +10 -0
- package/dist/pipeline/src/pipeline/createJobsForWorkspace.js.map +1 -0
- package/dist/pipeline/src/pipeline/createMainPipeline.js +18 -8
- package/dist/pipeline/src/pipeline/createMainPipeline.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.d.ts +3 -3
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +158 -51
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/packageManager.d.ts +2 -1
- package/dist/pipeline/src/pipeline/packageManager.js +36 -15
- package/dist/pipeline/src/pipeline/packageManager.js.map +1 -1
- package/dist/pipeline/src/types/config.d.ts +2 -1
- package/dist/pipeline/src/types/context.d.ts +77 -12
- package/dist/pipeline/src/types/context.js +9 -0
- package/dist/pipeline/src/types/context.js.map +1 -1
- package/dist/pipeline/src/types/environmentContext.d.ts +5 -6
- package/dist/pipeline/src/types/jobs.d.ts +5 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +2 -2
- package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +2 -10
- package/src/apps/cli/commands/project/setup/setupCloudRun.ts +1 -1
- package/src/apps/cli/commands/project/setup/setupContext.ts +2 -4
- package/src/apps/cli/commands/project/setup/setupKubernetes.ts +2 -2
- package/src/apps/cli/commands/project/utils/ensureNamespace.ts +1 -11
- package/src/gcloud/serviceAccounts.ts +3 -3
|
@@ -82,7 +82,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
82
82
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(sourceEnv, sourceComponent)];
|
|
83
83
|
case 3:
|
|
84
84
|
sourceContext = _g.sent();
|
|
85
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, sourceContext.env, sourceContext.
|
|
85
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, sourceContext.env, sourceContext.name)];
|
|
86
86
|
case 4:
|
|
87
87
|
sourceEnvVars = _g.sent();
|
|
88
88
|
closeAll = function () {
|
|
@@ -124,7 +124,7 @@ exports.default = (function (vorpal) { return __awaiter(void 0, void 0, void 0,
|
|
|
124
124
|
return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(targetEnv, targetComponent)];
|
|
125
125
|
case 9:
|
|
126
126
|
targetContext = _g.sent();
|
|
127
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.
|
|
127
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(this, targetContext.env, targetContext.name)];
|
|
128
128
|
case 10:
|
|
129
129
|
targetEnvVars = _g.sent();
|
|
130
130
|
if (!(targetEnv === "local")) return [3 /*break*/, 11];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2EAGgD;AAEhD,wEAA2F;AAC3F,4DAA4D;AAE5D,qEAAkE;AAClE,gEAAoE;AAEpE,mBAAe,UAAO,MAAc;;QAClC,sBAAA,MAAM;iBACH,OAAO,CACN,8BAA8B,EAC9B,yDAAyD,CAC1D;iBACA,MAAM,CAAC,SAAe,SAAS;;;;;;oCACjB,qBAAM,IAAA,kCAAgB,GAAE,EAAA;;gCAA/B,IAAI,GAAG,SAAwB;gCAEH,qBAAM,IAAI,CAAC,MAAM,CAAC;wCAClD,IAAI,EAAE,MAAM;wCACZ,IAAI,EAAE,uBAAuB;wCAC7B,OAAO,EAAE,IAAI;wCAEb,OAAO,EAAE,qDAAqD;qCAC/D,CAAC,EAAA;;gCANM,qBAAqB,GAAK,CAAA,SAMhC,CAAA,sBAN2B;gCAQvB,KAAA,OAA+B,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,IAAA,EAA9D,SAAS,QAAA,EAAE,eAAe,QAAA,CAAqC;gCAEhD,qBAAM,IAAA,6CAA0B,EACpD,SAAS,EACT,eAAe,CAChB,EAAA;;gCAHK,aAAa,GAAG,SAGrB;gCAEqB,qBAAM,IAAA,qCAAkB,EAC5C,IAAI,EACJ,aAAa,CAAC,GAAG,EACjB,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,7 +123,7 @@ var getProxyInfoForKubernetes = function (vorpal, context) { return __awaiter(vo
|
|
|
123
123
|
if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
|
|
124
124
|
throw new Error("unsupported");
|
|
125
125
|
}
|
|
126
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.
|
|
126
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name)];
|
|
127
127
|
case 1:
|
|
128
128
|
envVars = _b.sent();
|
|
129
129
|
cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
|
|
@@ -149,7 +149,7 @@ var getProxyInfoForCloudRun = function (vorpal, context) { return __awaiter(void
|
|
|
149
149
|
!((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
|
|
150
150
|
throw new Error("unsupported");
|
|
151
151
|
}
|
|
152
|
-
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.
|
|
152
|
+
return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name)];
|
|
153
153
|
case 1:
|
|
154
154
|
envVars = _d.sent();
|
|
155
155
|
DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,7 +122,7 @@ var setupCloudRun = function (instance, context) { return __awaiter(void 0, void
|
|
|
122
122
|
instance.log("domain suffix: " + suffix);
|
|
123
123
|
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
|
|
124
124
|
_a[pipeline_1.GCLOUD_RUN_CANONICAL_HOST_SUFFIX] = suffix,
|
|
125
|
-
_a), context.env, context.
|
|
125
|
+
_a), context.env, context.name, false, // backup
|
|
126
126
|
false)];
|
|
127
127
|
case 5:
|
|
128
128
|
_d.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAyB;;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAEK,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAEtC,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B,EAAE,sBAAsB;wBACvD,qCAAqC;8BAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,WAET,MAAM,CACP,EAAA;;gBAXD,SAWC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;kCACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"setupCloudRun.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupCloudRun.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAI6B;AAG7B,6EAAwF;AACxF,kGAAiG;AACjG,uEAA4E;AAC5E,yEAAgG;AAChG,sDAAiE;AAE1D,IAAM,aAAa,GAAG,UAC3B,QAAyB,EACzB,OAAyB;;;;;;;gBAEzB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBAC/D,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;gBACpE,CAAC;gBAEK,MAAM,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAEtC,kBAAkB;gBAElB,QAAQ,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC5C,qBAAM,IAAA,qCAAoB;wBAEtB,oBAAoB;wBACpB,iCAAiC;wBACjC,+BAA+B,EAAE,sBAAsB;wBACvD,qCAAqC;8BAClC,CAAC,MAAM,CAAC,QAAQ;wBACjB,CAAC,CAAC,CAAC,yBAAyB,EAAE,8BAA8B,CAAC;wBAC7D,CAAC,CAAC,EAAE,CAAC,WAET,MAAM,CACP,EAAA;;gBAXD,SAWC,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBAC7C,qBAAM,IAAA,iDAA6B,EAAC,MAAM,CAAC,EAAA;;gBAA3C,SAA2C,CAAC;gBAE5C,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBACjD,qBAAM,IAAA,yDAAuC,EAC3C,QAAQ,EACR,OAAO,EACP;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,yBAAyB;wBACtC,WAAW,EAAE,8CAA8C;wBAC3D,IAAI,EAAE,MAAM;wBACZ,yLAAyL;wBACzL,KAAK;4BACH,kCAAkC;4BAClC,iBAAiB;4BACjB,8BAA8B;4BAC9B,4BAA4B;kCACzB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SACrD;qBACF,EACD,wCAA6B,CAC9B,EAAA;;gBAlBD,SAkBC,CAAC;gBAEF,+CAA+C;gBAC/C,qDAAqD;gBACrD,qEAAqE;gBACrE,iEAAiE;gBACjE,QAAQ,CAAC,GAAG,CACV,gEAAgE,CACjE,CAAC;gBACa,qBAAM,IAAA,iDAAuB,EAAC,MAAM,CAAC,EAAA;;gBAA9C,MAAM,GAAG,SAAqC;gBACpD,QAAQ,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC;gBAEzC,qBAAM,IAAA,2BAAkB,EACtB,QAAQ;wBAEN,GAAC,2CAAgC,IAAG,MAAM;6BAE5C,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,IAAI,EACZ,KAAK,EAAE,SAAS;oBAChB,KAAK,CACN,EAAA;;gBATD,SASC,CAAC;;;;KACH,CAAC;AArEW,QAAA,aAAa,iBAqExB"}
|
|
@@ -48,7 +48,7 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
|
|
|
48
48
|
case 0:
|
|
49
49
|
instance.log("");
|
|
50
50
|
instance.log("==================================================================================");
|
|
51
|
-
instance.log("🐱 🔧 setting up " + context.env + ":" + context.
|
|
51
|
+
instance.log("🐱 🔧 setting up " + context.env + ":" + context.name + "...");
|
|
52
52
|
instance.log("");
|
|
53
53
|
if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) return [3 /*break*/, 2];
|
|
54
54
|
return [4 /*yield*/, (0, setupCloudRun_1.setupCloudRun)(instance, context)];
|
|
@@ -64,7 +64,7 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
|
|
|
64
64
|
_c.label = 4;
|
|
65
65
|
case 4:
|
|
66
66
|
instance.log("");
|
|
67
|
-
instance.log("✅ " + context.env + ":" + context.
|
|
67
|
+
instance.log("✅ " + context.env + ":" + context.name + " done!");
|
|
68
68
|
instance.log("");
|
|
69
69
|
return [2 /*return*/];
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAyB;;;;;;gBAEzB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAyB;;;;;;gBAEzB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,mBAAmB,GAAG,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;gBAC7E,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAzD,wBAAyD;gBAC3D,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;qBACxC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;gBAEjE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AAxBW,QAAA,YAAY,gBAwBvB"}
|
|
@@ -88,7 +88,7 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
88
88
|
// we name the service account and the role and the role binding with the same name
|
|
89
89
|
// we currently create one per component to better separate them
|
|
90
90
|
instance.log("ensuring service accounts...");
|
|
91
|
-
serviceAccountName = "cl-".concat(context.
|
|
91
|
+
serviceAccountName = "cl-".concat(context.name, "-deploy");
|
|
92
92
|
return [4 /*yield*/, (0, child_process_promise_1.exec)("TERM=dumb kubectl cluster-info | grep -E 'Kubernetes master|Kubernetes control plane' | awk '/http/ {print $NF}'").then(function (s) { return s.stdout.trim(); })];
|
|
93
93
|
case 7:
|
|
94
94
|
KUBE_URL = _b.sent();
|
|
@@ -144,7 +144,7 @@ var setupKubernetes = function (instance, context) { return __awaiter(void 0, vo
|
|
|
144
144
|
instance.log("service accounts created / updated!");
|
|
145
145
|
instance.log("");
|
|
146
146
|
instance.log("pusing secrets to gitlab...");
|
|
147
|
-
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, vars, context.env, context.
|
|
147
|
+
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, vars, context.env, context.name, false)];
|
|
148
148
|
case 19:
|
|
149
149
|
_b.sent();
|
|
150
150
|
instance.log("done!");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAG6B;AAE7B,+DAA6C;AAC7C,wDAAgE;AAChE,sDAIqC;AACrC,6EAAuD;AAEhD,IAAM,eAAe,GAAG,UAC7B,QAAyB,EACzB,OAAyB;;;;;;gBAEnB,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;gBAC5C,IAAI,CAAC,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAAE,CAAC;oBAChD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAC;gBAC9E,CAAC;gBAEyB,qBAAM,IAAA,uBAAc,EAAC,QAAQ,CAAC,EAAA;;gBAA5C,SAAS,GAAK,CAAA,SAA8B,CAAA,GAAnC;gBACC,qBAAM,IAAA,wBAAe,EACzC,QAAQ,EACR,mBAAY,SAAS,mBAAgB,CACtC,EAAA;;gBAHK,aAAa,GAAG,SAGrB;qBAGC,CAAC,aAAa,CAAC,IAAI,CACjB,UAAC,CAAmB,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,qBAAqB,EAAhC,CAAgC,CAC1D,EAFD,wBAEC;gBAED,QAAQ,CAAC,GAAG,CACV,0FAA0F,CAC3F,CAAC;gBAEF,qBAAM,IAAA,wBAAe,EACnB,QAAQ,EACR,mBAAY,SAAS,mBAAgB,EACrC;wBACE,EAAE,EAAE,SAAS;wBACb,IAAI,EAAE,qBAAqB;wBAC3B,MAAM,EAAE,CAAC,eAAe,CAAC;qBAC1B,EACD,MAAM,CACP,EAAA;;gBATD,SASC,CAAC;;;gBAGE,QAAQ,GAAG,IAAA,uCAA4B,EAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACpE,QAAQ,CAAC,GAAG,CAAC,mBAAY,QAAQ,CAAE,CAAC,CAAC;gBAErC,qBAAM,IAAA,0BAAgB,EAAC,QAAQ,CAAC,EAAA;;gBAAhC,SAAgC,CAAC;gBACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACrB,qBAAM,IAAA,yBAAe,EAAC,OAAO,CAAC,EAAA;;gBAA1C,SAAS,GAAG,SAA8B;gBAChD,QAAQ,CAAC,GAAG,CAAC,YAAY,GAAG,SAAS,GAAG,qBAAqB,CAAC,CAAC;gBAC/D,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,mBAAmB;gBAEnB,mFAAmF;gBACnF,gEAAgE;gBAChE,QAAQ,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;gBACvC,kBAAkB,GAAG,aAAM,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"setupKubernetes.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/setup/setupKubernetes.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,22 +46,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
46
46
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
47
|
}
|
|
48
48
|
};
|
|
49
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
50
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
51
|
-
if (!m) return o;
|
|
52
|
-
var i = m.call(o), r, ar = [], e;
|
|
53
|
-
try {
|
|
54
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
55
|
-
}
|
|
56
|
-
catch (error) { e = { error: error }; }
|
|
57
|
-
finally {
|
|
58
|
-
try {
|
|
59
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
60
|
-
}
|
|
61
|
-
finally { if (e) throw e.error; }
|
|
62
|
-
}
|
|
63
|
-
return ar;
|
|
64
|
-
};
|
|
65
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
66
50
|
var pipeline_1 = require("../../../../../../../pipeline/src/index.js");
|
|
67
51
|
var client_node_1 = require("@kubernetes/client-node");
|
|
@@ -77,15 +61,7 @@ function default_1(context) {
|
|
|
77
61
|
namespaceBody = new client_node_1.V1Namespace();
|
|
78
62
|
metadata = {
|
|
79
63
|
name: namespace,
|
|
80
|
-
labels: __assign(
|
|
81
|
-
.map(function (config) { return config.build.type; })
|
|
82
|
-
.join("_") }, Object.fromEntries(Object.entries(context.fullConfig.components).map(function (_a) {
|
|
83
|
-
var _b = __read(_a, 2), componentName = _b[0], config = _b[1];
|
|
84
|
-
return [
|
|
85
|
-
"buildType_" + componentName,
|
|
86
|
-
config.build.type,
|
|
87
|
-
];
|
|
88
|
-
}))), ((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {})),
|
|
64
|
+
labels: __assign({ customerName: context.fullConfig.customerName, appName: context.fullConfig.appName, environment: context.env, components: Object.keys(context.fullConfig.components).join("_") }, ((_b = (_a = context.fullConfig.meta) === null || _a === void 0 ? void 0 : _a.labels) !== null && _b !== void 0 ? _b : {})),
|
|
89
65
|
};
|
|
90
66
|
namespaceBody.metadata = metadata;
|
|
91
67
|
k8sApi = (0, k8sApi_1.getk8sApi)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensureNamespace.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/utils/ensureNamespace.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA6D;AAE7D,uDAAsD;AACtD,gDAAkD;AAElD,mBAA+B,OAAyB;;;;;;;oBAChD,SAAS,GAAG,IAAA,iCAAsB,EAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;oBACpE,aAAa,GAAG,IAAI,yBAAW,EAAE,CAAC;oBAClC,QAAQ,GAAiB;wBAC7B,IAAI,EAAE,SAAS;wBACf,MAAM,aACJ,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,EAC7C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,EACnC,WAAW,EAAE,OAAO,CAAC,GAAG,EACxB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAE7D,CAAC,MAAA,MAAA,OAAO,CAAC,UAAU,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,CAC3C;qBACF,CAAC;oBAEF,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC5B,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;;;;oBAEzB,qBAAM,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAA;;oBAArC,SAAqC,CAAC;oBAEtC,qBAAM,MAAM,CAAC,cAAc,CACzB,SAAS,EACT,aAAa,EACb,SAAS,EACT,SAAS,EACT,SAAS,EACT,SAAS,EACT,EAAE,OAAO,EAAE,EAAE,cAAc,EAAE,8BAA8B,EAAE,EAAE,CAChE,EAAA;;oBARD,SAQC,CAAC,CAAC,mBAAmB;;;;yBAElB,CAAA,CAAA,MAAA,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,0CAAE,MAAM,MAAK,UAAU,CAAA,EAAvC,wBAAuC;oBACzC,qBAAM,MAAM,CAAC,eAAe,CAAC,aAAa,CAAC,EAAA;;oBAA3C,SAA2C,CAAC;;;oBAE5C,OAAO,CAAC,KAAK,CAAC,MAAA,GAAC,CAAC,QAAQ,0CAAE,IAAI,CAAC,CAAC;oBAChC,MAAM,GAAC,CAAC;;wBAGZ,sBAAO,SAAS,EAAC;;;;CAClB;AAtCD,4BAsCC"}
|
|
@@ -77,7 +77,7 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
|
|
|
77
77
|
case 0:
|
|
78
78
|
projectId = account.projectId, name = account.name, displayName = account.displayName, roles = account.roles, description = account.description;
|
|
79
79
|
namePrefix = "".concat(name);
|
|
80
|
-
nameSuffixRaw = "".concat(context.env, "-").concat(context.
|
|
80
|
+
nameSuffixRaw = "".concat(context.env, "-").concat(context.name);
|
|
81
81
|
nameMiddleRaw = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName);
|
|
82
82
|
MAX_LENGTH = 30;
|
|
83
83
|
NUM_SEPARATORS = 2;
|
|
@@ -91,7 +91,7 @@ var upsertGcloudServiceAccount = function (context, account) { return __awaiter(
|
|
|
91
91
|
nameSuffix = nameSuffixRaw;
|
|
92
92
|
}
|
|
93
93
|
fullName = "".concat(namePrefix, "-").concat(nameMiddle, "-").concat(nameSuffix);
|
|
94
|
-
fullDisplayName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, " ").concat(context.env, ":").concat(context.
|
|
94
|
+
fullDisplayName = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, " ").concat(context.env, ":").concat(context.name, " | ").concat(displayName);
|
|
95
95
|
fullIdentifier = "".concat(fullName, "@").concat(projectId, ".iam.gserviceaccount.com");
|
|
96
96
|
return [4 /*yield*/, (0, exports.accountExists)(fullIdentifier)];
|
|
97
97
|
case 1:
|
|
@@ -177,7 +177,7 @@ var upsertGcloudServiceAccountAndSaveSecret = function (instance, context, accou
|
|
|
177
177
|
key = _b.sent();
|
|
178
178
|
return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, (_a = {},
|
|
179
179
|
_a[secretName] = key,
|
|
180
|
-
_a), context.env, context.
|
|
180
|
+
_a), context.env, context.name)];
|
|
181
181
|
case 2:
|
|
182
182
|
_b.sent();
|
|
183
183
|
instance.log("done!");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serviceAccounts.js","sourceRoot":"","sources":["../../../../src/gcloud/serviceAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,+DAA6C;AAC7C,iCAAoC;AAEpC,0CAAqD;AAE9C,IAAM,aAAa,GAAG,UAAO,cAAsB;;;;;;gBAEtD,qBAAM,IAAA,4BAAI,EAAC,+CAAwC,cAAc,CAAE,CAAC,EAAA;;gBAApE,SAAoE,CAAC;gBACrE,sBAAO,IAAI,EAAC;;;gBAEZ,sBAAO,KAAK,EAAC;;;;KAEhB,CAAC;AAPW,QAAA,aAAa,iBAOxB;AASF,IAAM,0BAA0B,GAAG,UACjC,OAAyB,EACzB,OAAuB;;;;;;gBAEf,SAAS,GAA4C,OAAO,UAAnD,EAAE,IAAI,GAAsC,OAAO,KAA7C,EAAE,WAAW,GAAyB,OAAO,YAAhC,EAAE,KAAK,GAAkB,OAAO,MAAzB,EAAE,WAAW,GAAK,OAAO,YAAZ,CAAa;gBAG/D,UAAU,GAAG,UAAG,IAAI,CAAE,CAAC;gBACvB,aAAa,GAAG,UAAG,OAAO,CAAC,GAAG,cAAI,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"serviceAccounts.js","sourceRoot":"","sources":["../../../../src/gcloud/serviceAccounts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
+
if (!m) return o;
|
|
16
|
+
var i = m.call(o), r, ar = [], e;
|
|
17
|
+
try {
|
|
18
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
+
}
|
|
20
|
+
catch (error) { e = { error: error }; }
|
|
21
|
+
finally {
|
|
22
|
+
try {
|
|
23
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
+
}
|
|
25
|
+
finally { if (e) throw e.error; }
|
|
26
|
+
}
|
|
27
|
+
return ar;
|
|
28
|
+
};
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
30
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
31
|
+
if (ar || !(i in from)) {
|
|
32
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
33
|
+
ar[i] = from[i];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.createBuildJobArtifacts = void 0;
|
|
40
|
+
var path_1 = require("path");
|
|
41
|
+
var types_1 = require("../../types");
|
|
42
|
+
var lodash_1 = require("lodash");
|
|
43
|
+
var writeDotEnv_1 = require("../base/writeDotEnv");
|
|
44
|
+
var createBuildJobArtifacts = function (context) {
|
|
45
|
+
var _a, _b;
|
|
46
|
+
var paths = context.type === "workspace"
|
|
47
|
+
? context.components.flatMap(function (c) { return getArtifactsPathForComponent(c); })
|
|
48
|
+
: getArtifactsPathForComponent(context, ["__build_info.json"]);
|
|
49
|
+
// esxclude .env files if generated
|
|
50
|
+
var exclude = context.type === "workspace"
|
|
51
|
+
? context.components.flatMap(function (c) { return getDotEnvPathsForComponent(c); })
|
|
52
|
+
: getDotEnvPathsForComponent(context);
|
|
53
|
+
return __assign(__assign({ paths: (0, lodash_1.uniq)(paths).sort(function (a, b) { return a.localeCompare(b); }) }, (exclude.length > 0 ? { exclude: exclude } : {})), { expire_in: "1 day", when: "always", reports:
|
|
54
|
+
// TODO: support for junit reports in other builds
|
|
55
|
+
context.type === "component" && (0, types_1.componentContextIsStandaloneBuild)(context)
|
|
56
|
+
? {
|
|
57
|
+
junit: (_b = (_a = context.build.config.artifactsReports) === null || _a === void 0 ? void 0 : _a.junit) === null || _b === void 0 ? void 0 : _b.map(function (p) {
|
|
58
|
+
return (0, path_1.join)(context.build.dir, p);
|
|
59
|
+
}),
|
|
60
|
+
}
|
|
61
|
+
: {} });
|
|
62
|
+
};
|
|
63
|
+
exports.createBuildJobArtifacts = createBuildJobArtifacts;
|
|
64
|
+
var getArtifactsPathForComponent = function (c, additionalPaths) {
|
|
65
|
+
var _a, _b;
|
|
66
|
+
return (_b = __spreadArray(__spreadArray([], __read(((_a = c.build.config.artifactsPaths) !== null && _a !== void 0 ? _a : [])), false), __read((additionalPaths !== null && additionalPaths !== void 0 ? additionalPaths : [])), false)) === null || _b === void 0 ? void 0 : _b.flatMap(function (artifact) {
|
|
67
|
+
return c.build
|
|
68
|
+
// in theory, we only need "direct",
|
|
69
|
+
// but in some cases project may have packages in the workspace that create build artifacts, which aren't components
|
|
70
|
+
// this highly depends on the build tool. To be safe, we get all
|
|
71
|
+
.getComponentDirs("all")
|
|
72
|
+
.flatMap(function (cDir) { return (0, path_1.join)(cDir, artifact); });
|
|
73
|
+
});
|
|
74
|
+
};
|
|
75
|
+
var getDotEnvPathsForComponent = function (c) {
|
|
76
|
+
if ((0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(c)) {
|
|
77
|
+
return [(0, path_1.join)(c.build.dir, ".env")];
|
|
78
|
+
}
|
|
79
|
+
return [];
|
|
80
|
+
};
|
|
81
|
+
//# sourceMappingURL=createBuildJobArtifact.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createBuildJobArtifact.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/artifacts/createBuildJobArtifact.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,qCAIqB;AAErB,iCAA8B;AAC9B,mDAA2E;AAEpE,IAAM,uBAAuB,GAAG,UACrC,OAAgB;;IAEhB,IAAM,KAAK,GACT,OAAO,CAAC,IAAI,KAAK,WAAW;QAC1B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA,4BAA4B,CAAC,CAAC,CAAC,EAA/B,CAA+B,CAAC;QACpE,CAAC,CAAC,4BAA4B,CAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACnE,mCAAmC;IACnC,IAAM,OAAO,GACX,OAAO,CAAC,IAAI,KAAK,WAAW;QAC1B,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA,0BAA0B,CAAC,CAAC,CAAC,EAA7B,CAA6B,CAAC;QAClE,CAAC,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAC1C,2BACE,KAAK,EAAE,IAAA,aAAI,EAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAlB,CAAkB,CAAC,IAClD,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,SAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAC1C,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,QAAQ,EACd,OAAO;QACL,kDAAkD;QAClD,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,IAAA,yCAAiC,EAAC,OAAO,CAAC;YACxE,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,0CAAE,KAAK,0CAAE,GAAG,CAAC,UAAC,CAAC;oBACzD,OAAA,IAAA,WAAI,EAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAA1B,CAA0B,CAC3B;aACF;YACH,CAAC,CAAC,EAAE,IACR;AACJ,CAAC,CAAC;AA3BW,QAAA,uBAAuB,2BA2BlC;AACF,IAAM,4BAA4B,GAAG,UACnC,CAAmB,EACnB,eAA0B;;IAE1B,OAAO,6CACF,CAAC,MAAA,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,mCAAI,EAAE,CAAC,kBACrC,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,mDACzB,OAAO,CAAC,UAAC,QAAQ;QAClB,OAAA,CAAC,CAAC,KAAK;YACL,oCAAoC;YACpC,oHAAoH;YACpH,gEAAgE;aAC/D,gBAAgB,CAAC,KAAK,CAAC;aACvB,OAAO,CAAC,UAAC,IAAI,IAAK,OAAA,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAApB,CAAoB,CAAC;IAL1C,CAK0C,CAC3C,CAAC;AACJ,CAAC,CAAC;AAEF,IAAM,0BAA0B,GAAG,UAAC,CAAmB;IACrD,IAAI,IAAA,kDAAoC,EAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,OAAO,CAAC,IAAA,WAAI,EAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ComponentContext } from "../..";
|
|
1
|
+
import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
|
|
2
2
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
|
-
export type AppBuildJobDefinition = Partial<CatladderJob
|
|
4
|
-
export declare const createAppBuildJob: (context: ComponentContext, { script, variables, runnerVariables, ...def }: AppBuildJobDefinition) => CatladderJob;
|
|
3
|
+
export type AppBuildJobDefinition = Partial<Omit<CatladderJob, "artifacts">>;
|
|
4
|
+
export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, { script, variables, runnerVariables, ...def }: AppBuildJobDefinition) => CatladderJob;
|
|
@@ -49,15 +49,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.createAppBuildJob = void 0;
|
|
51
51
|
var lodash_1 = require("lodash");
|
|
52
|
-
var path_1 = require("path");
|
|
53
52
|
var __1 = require("../..");
|
|
54
53
|
var utils_1 = require("../../utils");
|
|
54
|
+
var createBuildJobArtifact_1 = require("../artifacts/createBuildJobArtifact");
|
|
55
55
|
var yarn_1 = require("../node/yarn");
|
|
56
56
|
var constants_1 = require("./constants");
|
|
57
57
|
var writeBuildInfo_1 = require("./writeBuildInfo");
|
|
58
58
|
var writeDotEnv_1 = require("./writeDotEnv");
|
|
59
59
|
var createAppBuildJob = function (context, _a) {
|
|
60
|
-
var _b, _c, _d
|
|
60
|
+
var _b, _c, _d;
|
|
61
61
|
var script = _a.script, variables = _a.variables, runnerVariables = _a.runnerVariables, def = __rest(_a, ["script", "variables", "runnerVariables"]);
|
|
62
62
|
return (0, lodash_1.merge)({
|
|
63
63
|
name: constants_1.APP_BUILD_JOB_NAME,
|
|
@@ -66,20 +66,21 @@ var createAppBuildJob = function (context, _a) {
|
|
|
66
66
|
image: (0, __1.getRunnerImage)("jobs-default"),
|
|
67
67
|
needs: [],
|
|
68
68
|
cache: [],
|
|
69
|
-
variables: __assign(__assign(
|
|
69
|
+
variables: __assign(__assign({}, (variables !== null && variables !== void 0 ? variables : {})), (context.type === "component"
|
|
70
|
+
? __assign(__assign(__assign({}, context.environment.envVars), context.environment.jobOnlyVars.build.envVars), ((_b = context.build.config.extraVars) !== null && _b !== void 0 ? _b : {})) : {})),
|
|
70
71
|
runnerVariables: __assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), (runnerVariables !== null && runnerVariables !== void 0 ? runnerVariables : {})), ((_c = context.build.config.runnerVariables) !== null && _c !== void 0 ? _c : {})),
|
|
71
|
-
script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((
|
|
72
|
-
? (0, writeDotEnv_1.
|
|
73
|
-
|
|
72
|
+
script: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((context.type === "component"
|
|
73
|
+
? (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(context)
|
|
74
|
+
? (0, writeDotEnv_1.writeDotEnv)(context)
|
|
75
|
+
: []
|
|
76
|
+
: context.type === "workspace"
|
|
77
|
+
? context.components
|
|
78
|
+
.filter(function (c) { return (0, writeDotEnv_1.componentContextNeedsBuildTimeDotEnv)(c); })
|
|
79
|
+
.flatMap(function (c) { return (0, writeDotEnv_1.writeDotEnv)(c); })
|
|
80
|
+
: [])), false), __read((context.type === "component" ? (0, writeBuildInfo_1.writeBuildInfo)(context) : [])), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), [
|
|
74
81
|
"cd ".concat(context.build.dir)
|
|
75
82
|
], false), __read(((_d = (0, utils_1.ensureArray)(script)) !== null && _d !== void 0 ? _d : [])), false),
|
|
76
|
-
artifacts:
|
|
77
|
-
? { exclude: [(0, path_1.join)(context.build.dir, ".env")] }
|
|
78
|
-
: {})), { reports: {
|
|
79
|
-
junit: (_f = (_e = context.build.config.artifactsReports) === null || _e === void 0 ? void 0 : _e.junit) === null || _f === void 0 ? void 0 : _f.map(function (p) {
|
|
80
|
-
return (0, path_1.join)(context.build.dir, p);
|
|
81
|
-
}),
|
|
82
|
-
} }),
|
|
83
|
+
artifacts: (0, createBuildJobArtifact_1.createBuildJobArtifacts)(context),
|
|
83
84
|
}, def);
|
|
84
85
|
};
|
|
85
86
|
exports.createAppBuildJob = createAppBuildJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;
|
|
1
|
+
{"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAM/B,2BAAuC;AAEvC,qCAA0C;AAC1C,8EAA8E;AAC9E,qCAAiD;AACjD,yCAGqB;AACrB,mDAAkD;AAClD,6CAGuB;AAGhB,IAAM,iBAAiB,GAAG,UAC/B,OAAoE,EACpE,EAAqE;;IAAnE,IAAA,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,eAAe,qBAAA,EAAK,GAAG,cAA5C,0CAA8C,CAAF;IAE5C,OAAO,IAAA,cAAK,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,EAAE;QACT,SAAS,wBACJ,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC,GACjB,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAC9B,CAAC,gCACM,OAAO,CAAC,WAAW,CAAC,OAAO,GAC3B,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC,EAE7C,CAAC,CAAC,EAAE,CAAC,CACR;QACD,eAAe,iCACV,2CAA+B,GAC/B,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC,GACvB,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC,CAChD;QAED,MAAM,mFACD,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;gBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;gBACtB,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;qBACf,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,kDAAoC,EAAC,CAAC,CAAC,EAAvC,CAAuC,CAAC;qBACtD,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,yBAAW,EAAC,CAAC,CAAC,EAAd,CAAc,CAAC;gBACnC,CAAC,CAAC,EAAE,CAAC,kBACN,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBAC7D,IAAA,wBAAiB,EAAC,OAAO,CAAC;YAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;0BACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,mCAAI,EAAE,CAAC,SAC/B;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { WorkspaceContext } from "../../types/context";
|
|
2
|
+
import { type ComponentContext } from "../../types/context";
|
|
2
3
|
import type { CatladderJob } from "../../types/jobs";
|
|
3
4
|
import type { DockerBuildJobDefinition } from "../docker";
|
|
4
5
|
import type { AppBuildJobDefinition } from "./createAppBuildJob";
|
|
5
|
-
export declare const
|
|
6
|
+
export declare const createComponentBuildJobs: (context: ComponentContext, definitions: {
|
|
6
7
|
appBuild?: AppBuildJobDefinition;
|
|
7
8
|
dockerBuild: DockerBuildJobDefinition;
|
|
8
9
|
}) => CatladderJob[];
|
|
10
|
+
export declare const createWorkspaceBuildJobs: (context: WorkspaceContext, definitions: {
|
|
11
|
+
appBuild?: AppBuildJobDefinition;
|
|
12
|
+
}) => CatladderJob[];
|
|
@@ -36,21 +36,39 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
36
36
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.
|
|
39
|
+
exports.createWorkspaceBuildJobs = exports.createComponentBuildJobs = void 0;
|
|
40
40
|
var sbom_1 = require("../../deploy/sbom");
|
|
41
|
+
var context_1 = require("../../types/context");
|
|
41
42
|
var docker_1 = require("../docker");
|
|
42
43
|
var sbom_2 = require("../sbom");
|
|
43
44
|
var constants_1 = require("./constants");
|
|
44
45
|
var createAppBuildJob_1 = require("./createAppBuildJob");
|
|
45
|
-
var
|
|
46
|
+
var createComponentBuildJobs = function (context, definitions) {
|
|
46
47
|
var _a;
|
|
47
|
-
return __spreadArray(__spreadArray(__spreadArray([], __read((definitions.appBuild
|
|
48
|
+
return __spreadArray(__spreadArray(__spreadArray([], __read((definitions.appBuild && (0, context_1.componentContextIsStandaloneBuild)(context)
|
|
48
49
|
? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)]
|
|
49
50
|
: [])), false), __read(((0, docker_1.requiresDockerBuild)(context)
|
|
50
51
|
? [
|
|
51
|
-
(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), { needs: __spreadArray(__spreadArray([], __read(((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : [])), false), __read((definitions.appBuild
|
|
52
|
+
(0, docker_1.createDockerBuildJobBase)(context, __assign(__assign({}, definitions.dockerBuild), { needs: __spreadArray(__spreadArray([], __read(((_a = definitions.dockerBuild.needs) !== null && _a !== void 0 ? _a : [])), false), __read((definitions.appBuild &&
|
|
53
|
+
(0, context_1.componentContextIsStandaloneBuild)(context)
|
|
54
|
+
? [constants_1.APP_BUILD_JOB_NAME]
|
|
55
|
+
: (0, context_1.componentContextHasWorkspaceBuild)(context)
|
|
56
|
+
? [
|
|
57
|
+
{
|
|
58
|
+
job: constants_1.APP_BUILD_JOB_NAME,
|
|
59
|
+
artifacts: true,
|
|
60
|
+
workspaceName: context.build.workspaceName,
|
|
61
|
+
},
|
|
62
|
+
]
|
|
63
|
+
: [])), false) })),
|
|
52
64
|
]
|
|
53
65
|
: [])), false), __read(((0, sbom_1.sbomDeactivated)(context) ? [] : [(0, sbom_2.createSbomBuildJob)(context)])), false);
|
|
54
66
|
};
|
|
55
|
-
exports.
|
|
67
|
+
exports.createComponentBuildJobs = createComponentBuildJobs;
|
|
68
|
+
var createWorkspaceBuildJobs = function (context, definitions) {
|
|
69
|
+
return definitions.appBuild
|
|
70
|
+
? [(0, createAppBuildJob_1.createAppBuildJob)(context, definitions.appBuild)]
|
|
71
|
+
: [];
|
|
72
|
+
};
|
|
73
|
+
exports.createWorkspaceBuildJobs = createWorkspaceBuildJobs;
|
|
56
74
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoD;AAEpD,+CAI6B;AAG7B,oCAA0E;AAC1E,gCAA6C;AAC7C,yCAAiD;AAEjD,yDAAwD;AAEjD,IAAM,wBAAwB,GAAG,UACtC,OAAyB,EACzB,WAGC;;IAED,4DACK,CAAC,WAAW,CAAC,QAAQ,IAAI,IAAA,2CAAiC,EAAC,OAAO,CAAC;QACpE,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC,kBACJ,CAAC,IAAA,4BAAmB,EAAC,OAAO,CAAC;QAC9B,CAAC,CAAC;YACE,IAAA,iCAAwB,EAAC,OAAO,wBAC3B,WAAW,CAAC,WAAW,KAC1B,KAAK,yCACA,CAAC,MAAA,WAAW,CAAC,WAAW,CAAC,KAAK,mCAAI,EAAE,CAAC,kBACrC,CAAC,WAAW,CAAC,QAAQ;oBACxB,IAAA,2CAAiC,EAAC,OAAO,CAAC;oBACxC,CAAC,CAAC,CAAC,8BAAkB,CAAC;oBACtB,CAAC,CAAC,IAAA,2CAAiC,EAAC,OAAO,CAAC;wBAC1C,CAAC,CAAC;4BACE;gCACE,GAAG,EAAE,8BAAkB;gCACvB,SAAS,EAAE,IAAI;gCACf,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;6BAC3C;yBACF;wBACH,CAAC,CAAC,EAAE,CAAC,aAEX;SACH;QACH,CAAC,CAAC,EAAE,CAAC,kBACJ,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAkB,EAAC,OAAO,CAAC,CAAC,CAAC,UAClE;AACJ,CAAC,CAAC;AAnCW,QAAA,wBAAwB,4BAmCnC;AAEK,IAAM,wBAAwB,GAAG,UACtC,OAAyB,EACzB,WAEC;IAED,OAAO,WAAW,CAAC,QAAQ;QACzB,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AATW,QAAA,wBAAwB,4BASnC"}
|
|
@@ -18,6 +18,7 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
19
|
exports.componentContextNeedsBuildTimeDotEnv = exports.writeDotEnv = void 0;
|
|
20
20
|
var lodash_1 = require("lodash");
|
|
21
|
+
var gitlab_1 = require("../../utils/gitlab");
|
|
21
22
|
/**
|
|
22
23
|
* writes a .env file in the components folder
|
|
23
24
|
* @param context
|
|
@@ -37,9 +38,9 @@ var writeDotEnv = function (context) {
|
|
|
37
38
|
return "".concat(key, "=").concat(value === null || value === void 0 ? void 0 : value.toString().replaceAll("\n", "\\n"));
|
|
38
39
|
})
|
|
39
40
|
.join("\n");
|
|
40
|
-
return [
|
|
41
|
+
return (0, gitlab_1.collapseableSection)("write-dotenv-" + context.name, "write dot env")([
|
|
41
42
|
"cat <<EOF > ".concat(context.build.dir, "/.env\n").concat(keyValueString, "\nEOF"),
|
|
42
|
-
];
|
|
43
|
+
]);
|
|
43
44
|
};
|
|
44
45
|
exports.writeDotEnv = writeDotEnv;
|
|
45
46
|
var componentContextNeedsBuildTimeDotEnv = function (context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;
|
|
1
|
+
{"version":3,"file":"writeDotEnv.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/writeDotEnv.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,iCAA+B;AAE/B,6CAAyD;AAEzD;;;;GAIG;AACI,IAAM,WAAW,GAAG,UAAC,OAAyB;IACnD,IAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;IAE5C,wCAAwC;IACxC,IAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAC5C,uCAAuC;SACtC,MAAM,CAAC,UAAC,EAAS;YAAT,KAAA,aAAS,EAAN,KAAK,QAAA;QAAM,OAAA,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC;IAAb,CAAa,CAAC;SACpC,GAAG,CACF,UAAC,EAAY;YAAZ,KAAA,aAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAAM,OAAA,UAAG,GAAG,cAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAE;IAArD,CAAqD,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,IAAA,4BAAmB,EACxB,eAAe,GAAG,OAAO,CAAC,IAAI,EAC9B,eAAe,CAChB,CAAC;QACA,sBAAe,OAAO,CAAC,KAAK,CAAC,GAAG,oBAClC,cAAc,UACZ;KACD,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,WAAW,eAoBtB;AAEK,IAAM,oCAAoC,GAAG,UAClD,OAAyB;IAEzB,OAAO,OAAO,CAAC,eAAe,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,kCAAkC;AACpF,CAAC,CAAC;AAJW,QAAA,oCAAoC,wCAI/C"}
|
|
@@ -26,7 +26,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
26
26
|
};
|
|
27
27
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
28
28
|
exports.createCustomBuildJobs = void 0;
|
|
29
|
-
var path_1 = require("path");
|
|
30
29
|
var utils_1 = require("../../utils");
|
|
31
30
|
var docker_1 = require("../docker");
|
|
32
31
|
var types_1 = require("../types");
|
|
@@ -37,12 +36,12 @@ var RUNNER_BUILD_VARIABLES = {
|
|
|
37
36
|
KUBERNETES_MEMORY_LIMIT: "4Gi",
|
|
38
37
|
};
|
|
39
38
|
var createCustomBuildJobs = function (context) {
|
|
40
|
-
var _a
|
|
39
|
+
var _a;
|
|
41
40
|
var buildConfig = context.build.config;
|
|
42
41
|
if (!(0, types_1.isOfBuildType)(buildConfig, "custom")) {
|
|
43
42
|
throw new Error("deploy config is not custom");
|
|
44
43
|
}
|
|
45
|
-
return (0, base_1.
|
|
44
|
+
return (0, base_1.createComponentBuildJobs)(context, {
|
|
46
45
|
appBuild: buildConfig.buildCommand !== null
|
|
47
46
|
? {
|
|
48
47
|
image: buildConfig.jobImage,
|
|
@@ -50,15 +49,6 @@ var createCustomBuildJobs = function (context) {
|
|
|
50
49
|
cache: buildConfig.jobCache,
|
|
51
50
|
services: buildConfig.jobServices,
|
|
52
51
|
script: __spreadArray([], __read(((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : [])), false),
|
|
53
|
-
artifacts: {
|
|
54
|
-
paths: __spreadArray([
|
|
55
|
-
(0, path_1.join)(context.build.dir, "__build_info.json"),
|
|
56
|
-
(0, path_1.join)(context.build.dir, "dist")
|
|
57
|
-
], __read(((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
|
|
58
|
-
return (0, path_1.join)(context.build.dir, path);
|
|
59
|
-
})) !== null && _c !== void 0 ? _c : [])), false),
|
|
60
|
-
expire_in: "1 day",
|
|
61
|
-
},
|
|
62
52
|
}
|
|
63
53
|
: undefined,
|
|
64
54
|
dockerBuild: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/custom/buildJob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAA0C;AAC1C,oCAAsE;AACtE,kCAAyC;AAGzC,gCAAmD;AAEnD,IAAM,sBAAsB,GAAG;IAC7B,sBAAsB,EAAE,KAAK;IAC7B,yBAAyB,EAAE,KAAK;IAChC,uBAAuB,EAAE,KAAK;CAC/B,CAAC;AAEK,IAAM,qBAAqB,GAAG,UACnC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EACN,WAAW,CAAC,YAAY,KAAK,IAAI;YAC/B,CAAC,CAAC;gBACE,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,eAAe,EAAE,sBAAsB;gBACvC,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,WAAW,CAAC,WAAW;gBACjC,MAAM,2BAAM,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC,SAAC;aAC3D;YACH,CAAC,CAAC,SAAS;QACf,WAAW,EAAE;YACX,MAAM,EAAE,IAAA,kDAAyC,EAAC,OAAO,CAAC;YAE1D,SAAS,EAAE,EAAE;SACd;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AA1BW,QAAA,qBAAqB,yBA0BhC"}
|