@payfit/nx-core 4.9.1-ephemeral.9 → 4.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/executors/publisher/docker.js +13 -10
- package/dist/src/executors/publisher/docker.js.map +1 -1
- package/dist/src/executors/publisher/executor.js +9 -7
- package/dist/src/executors/publisher/executor.js.map +1 -1
- package/dist/src/executors/publisher/helm.js +19 -16
- package/dist/src/executors/publisher/helm.js.map +1 -1
- package/dist/src/index.js +13 -10
- package/dist/src/index.js.map +1 -1
- package/dist/src/scripts/version-action.js +7 -5
- package/dist/src/scripts/version-action.js.map +1 -1
- package/dist/src/utils/aws-auth.js +19 -11
- package/dist/src/utils/aws-auth.js.map +1 -1
- package/dist/src/utils/docker.js +9 -5
- package/dist/src/utils/docker.js.map +1 -1
- package/dist/src/utils/exec.js +10 -6
- package/dist/src/utils/exec.js.map +1 -1
- package/dist/src/utils/get-version.js +5 -2
- package/dist/src/utils/get-version.js.map +1 -1
- package/dist/src/utils/github.js +6 -3
- package/dist/src/utils/github.js.map +1 -1
- package/dist/src/utils/helm.js +29 -21
- package/dist/src/utils/helm.js.map +1 -1
- package/dist/src/utils/import-esm.js +6 -2
- package/dist/src/utils/import-esm.js.map +1 -1
- package/dist/src/utils/tsh.js +29 -21
- package/dist/src/utils/tsh.js.map +1 -1
- package/package.json +7 -1
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.publishDocker = publishDocker;
|
|
4
|
+
const fs = require("node:fs");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const aws_auth_1 = require("../../utils/aws-auth");
|
|
7
|
+
const docker_1 = require("../../utils/docker");
|
|
8
|
+
async function publishDocker(options, context, version) {
|
|
9
|
+
await (0, aws_auth_1.checkAwsAuth)();
|
|
10
|
+
await (0, aws_auth_1.loginToEcr)();
|
|
8
11
|
const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
|
|
9
|
-
const projectDockerfile = join(projectRoot, 'Dockerfile');
|
|
12
|
+
const projectDockerfile = (0, path_1.join)(projectRoot, 'Dockerfile');
|
|
10
13
|
if (!fs.existsSync(projectDockerfile)) {
|
|
11
14
|
throw new Error('Dockerfile not found in project root');
|
|
12
15
|
}
|
|
13
16
|
console.log('Building docker image with version ' + version);
|
|
14
|
-
await buildDockerImage(options.ecrRegistry, projectDockerfile, version);
|
|
17
|
+
await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version);
|
|
15
18
|
console.log(`Publishing docker image to ${options.ecrRegistry} with version ${version}`);
|
|
16
|
-
return await pushImageToEcr(options.ecrRegistry, version);
|
|
19
|
+
return await (0, aws_auth_1.pushImageToEcr)(options.ecrRegistry, version);
|
|
17
20
|
}
|
|
18
21
|
//# sourceMappingURL=docker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AASA,sCAwBC;AAjCD,8BAA6B;AAC7B,+BAA2B;AAI3B,mDAA+E;AAC/E,+CAAqD;AAG9C,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe;IAIf,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,GAAE,CAAA;IAElB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAA;IACnE,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAEzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC5D,MAAM,IAAA,yBAAgB,EAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAEvE,OAAO,CAAC,GAAG,CACT,8BAA8B,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5E,CAAA;IACD,OAAO,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const get_version_1 = require("../../utils/get-version");
|
|
4
|
+
const docker_1 = require("./docker");
|
|
5
|
+
const helm_1 = require("./helm");
|
|
4
6
|
const runExecutor = async (options, context) => {
|
|
5
7
|
try {
|
|
6
|
-
const version = getVersion(context.projectName);
|
|
7
|
-
await publishDocker(options, context, version);
|
|
8
|
-
await publishHelm(options, context, version);
|
|
8
|
+
const version = (0, get_version_1.getVersion)(context.projectName);
|
|
9
|
+
await (0, docker_1.publishDocker)(options, context, version);
|
|
10
|
+
await (0, helm_1.publishHelm)(options, context, version);
|
|
9
11
|
}
|
|
10
12
|
catch (error) {
|
|
11
13
|
console.error(error);
|
|
@@ -17,5 +19,5 @@ const runExecutor = async (options, context) => {
|
|
|
17
19
|
success: true,
|
|
18
20
|
};
|
|
19
21
|
};
|
|
20
|
-
|
|
22
|
+
exports.default = runExecutor;
|
|
21
23
|
//# sourceMappingURL=executor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,yDAAoD;AACpD,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAA,wBAAU,EAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC/C,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;QAC9C,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QACpB,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -1,37 +1,40 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.publishHelm = publishHelm;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const fs = require("node:fs");
|
|
6
|
+
const aws_auth_1 = require("../../utils/aws-auth");
|
|
7
|
+
const github_1 = require("../../utils/github");
|
|
8
|
+
const helm_1 = require("../../utils/helm");
|
|
9
|
+
const tsh_1 = require("../../utils/tsh");
|
|
10
|
+
async function publishHelm(options, context, version) {
|
|
8
11
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
9
12
|
try {
|
|
10
13
|
const projectHelmFolder = `apps/${context.projectName}/.deploy`;
|
|
11
14
|
const destinationHelmFolder = `dist/apps/${context.projectName}/chart/`;
|
|
12
|
-
const gitBranchName = await getSanitizedCurrentGitBranch();
|
|
15
|
+
const gitBranchName = await (0, github_1.getSanitizedCurrentGitBranch)();
|
|
13
16
|
if (!gitBranchName)
|
|
14
17
|
throw new Error('Unable to get current Git branch');
|
|
15
|
-
await checkAwsAuth();
|
|
18
|
+
await (0, aws_auth_1.checkAwsAuth)();
|
|
16
19
|
if (!fs.existsSync(projectHelmFolder)) {
|
|
17
20
|
throw new Error(`.deploy folder not found for project ${context.projectName}`);
|
|
18
21
|
}
|
|
19
22
|
console.log(`Publishing Helm chart to ${options.chartRegistry}/${gitBranchName} with version ${version}`);
|
|
20
23
|
// connect to the chartmuseum through teleport
|
|
21
|
-
const proxyData = __addDisposableResource(env_1, await getLocalPortForChartMuseum(), false);
|
|
24
|
+
const proxyData = tslib_1.__addDisposableResource(env_1, await (0, tsh_1.getLocalPortForChartMuseum)(), false);
|
|
22
25
|
await proxyData.isReady();
|
|
23
|
-
await setupTeleportProxyHelmChartFile(projectHelmFolder, proxyData.port);
|
|
24
|
-
await installHelmRepo(projectHelmFolder);
|
|
25
|
-
await packageHelm(projectHelmFolder, version, destinationHelmFolder);
|
|
26
|
-
await resetTeleportProxyHelmChartFile(projectHelmFolder, proxyData.port);
|
|
27
|
-
return pushPackagedHelm(`${destinationHelmFolder}${context.projectName}-${version}.tgz`, options.chartRegistry, gitBranchName);
|
|
26
|
+
await (0, helm_1.setupTeleportProxyHelmChartFile)(projectHelmFolder, proxyData.port);
|
|
27
|
+
await (0, helm_1.installHelmRepo)(projectHelmFolder);
|
|
28
|
+
await (0, helm_1.packageHelm)(projectHelmFolder, version, destinationHelmFolder);
|
|
29
|
+
await (0, helm_1.resetTeleportProxyHelmChartFile)(projectHelmFolder, proxyData.port);
|
|
30
|
+
return (0, helm_1.pushPackagedHelm)(`${destinationHelmFolder}${context.projectName}-${version}.tgz`, options.chartRegistry, gitBranchName);
|
|
28
31
|
}
|
|
29
32
|
catch (e_1) {
|
|
30
33
|
env_1.error = e_1;
|
|
31
34
|
env_1.hasError = true;
|
|
32
35
|
}
|
|
33
36
|
finally {
|
|
34
|
-
__disposeResources(env_1);
|
|
37
|
+
tslib_1.__disposeResources(env_1);
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
//# sourceMappingURL=helm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAgBA,kCAsCC;;AAtDD,8BAA6B;AAI7B,mDAAmD;AACnD,+CAAiE;AACjE,2CAMyB;AACzB,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe;;;QAMf,MAAM,iBAAiB,GAAG,QAAQ,OAAO,CAAC,WAAW,UAAU,CAAA;QAC/D,MAAM,qBAAqB,GAAG,aAAa,OAAO,CAAC,WAAW,SAAS,CAAA;QACvE,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO,CAAC,WAAW,EAAE,CAC9D,CAAA;QACH,CAAC;QACD,OAAO,CAAC,GAAG,CACT,4BAA4B,OAAO,CAAC,aAAa,IAAI,aAAa,iBAAiB,OAAO,EAAE,CAC7F,CAAA;QACD,8CAA8C;QAC9C,MAAM,SAAS,0CAAG,MAAM,IAAA,gCAA0B,GAAE,QAAA,CAAA;QACpD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAA;QAEzB,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,kBAAW,EAAC,iBAAiB,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAA;QACpE,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,OAAO,IAAA,uBAAgB,EACrB,GAAG,qBAAqB,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,MAAM,EAC/D,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;;;;;;;;;CACF"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createNodesV2 = void 0;
|
|
4
|
+
const fs_1 = require("fs");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
const devkit_1 = require("@nx/devkit");
|
|
7
|
+
exports.createNodesV2 = [
|
|
5
8
|
'**/project.json',
|
|
6
9
|
async (configFiles, options, context) => {
|
|
7
|
-
return await createNodesFromFiles((configFile, options, context) => createNodesInternal(configFile, options, context), configFiles, options, context);
|
|
10
|
+
return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context), configFiles, options, context);
|
|
8
11
|
},
|
|
9
12
|
];
|
|
10
13
|
async function createNodesInternal(configFilePath, options, context) {
|
|
11
|
-
const projectConfiguration = readJsonFile(configFilePath);
|
|
12
|
-
const projectRoot = dirname(configFilePath);
|
|
13
|
-
const isDockerProject = existsSync(join(projectRoot, 'Dockerfile'));
|
|
14
|
-
const isHelmProject = existsSync(join(projectRoot, '.deploy/Chart.yaml'));
|
|
14
|
+
const projectConfiguration = (0, devkit_1.readJsonFile)(configFilePath);
|
|
15
|
+
const projectRoot = (0, path_1.dirname)(configFilePath);
|
|
16
|
+
const isDockerProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'Dockerfile'));
|
|
17
|
+
const isHelmProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, '.deploy/Chart.yaml'));
|
|
15
18
|
const targets = {};
|
|
16
19
|
const ecrRegistry = isDockerProject
|
|
17
20
|
? projectConfiguration.metadata &&
|
|
@@ -22,7 +25,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
22
25
|
projectConfiguration.metadata['chartRegistry']
|
|
23
26
|
: undefined;
|
|
24
27
|
if (isHelmProject || isDockerProject) {
|
|
25
|
-
const publisherConfig = readJsonFile(join(__dirname, '/executors/publisher/schema.json'));
|
|
28
|
+
const publisherConfig = (0, devkit_1.readJsonFile)((0, path_1.join)(__dirname, '/executors/publisher/schema.json'));
|
|
26
29
|
targets['nx-release-publish'] = {
|
|
27
30
|
executor: '@payfit/nx-core:publisher',
|
|
28
31
|
options: {
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,2BAA+B;AAC/B,+BAAoC;AAEpC,uCAKmB;AAKN,QAAA,aAAa,GAAmC;IAC3D,iBAAiB;IACjB,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QACtC,OAAO,MAAM,IAAA,6BAAoB,EAC/B,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAC/B,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,EACnD,WAAW,EACX,OAAO,EACP,OAAO,CACR,CAAA;IACH,CAAC;CACF,CAAA;AAED,KAAK,UAAU,mBAAmB,CAChC,cAAsB,EACtB,OAAwB,EACxB,OAA6B;IAE7B,MAAM,oBAAoB,GAAG,IAAA,qBAAY,EAAC,cAAc,CAAC,CAAA;IACzD,MAAM,WAAW,GAAG,IAAA,cAAO,EAAC,cAAc,CAAC,CAAA;IAE3C,MAAM,eAAe,GAAG,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;IACnE,MAAM,aAAa,GAAG,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAA;IAEzE,MAAM,OAAO,GAAG,EAAE,CAAA;IAElB,MAAM,WAAW,GAAG,eAAe;QACjC,CAAC,CAAC,oBAAoB,CAAC,QAAQ;YAC7B,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC;QAChD,CAAC,CAAC,SAAS,CAAA;IACb,MAAM,aAAa,GAAG,aAAa;QACjC,CAAC,CAAC,oBAAoB,CAAC,QAAQ;YAC7B,oBAAoB,CAAC,QAAQ,CAAC,eAAe,CAAC;QAChD,CAAC,CAAC,SAAS,CAAA;IAEb,IAAI,aAAa,IAAI,eAAe,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,IAAA,qBAAY,EAClC,IAAA,WAAI,EAAC,SAAS,EAAE,kCAAkC,CAAC,CACpD,CAAA;QACD,OAAO,CAAC,oBAAoB,CAAC,GAAG;YAC9B,QAAQ,EAAE,2BAA2B;YACrC,OAAO,EAAE;gBACP,WAAW;gBACX,aAAa;aACd;YACD,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,CAAC,YAAY,EAAE,aAAa,CAAC;YACrC,OAAO,EAAE,CAAC,6BAA6B,oBAAoB,CAAC,IAAI,QAAQ,CAAC;YACzE,QAAQ,EAAE;gBACR,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAChC,WAAW,EAAE,eAAe,CAAC,WAAW;aACzC;SACF,CAAA;IACH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,WAAW,CAAC,EAAE;gBACb,GAAG,oBAAoB;gBACvB,OAAO;aACR;SACF;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const release_1 = require("nx/release");
|
|
4
|
+
const semver_1 = require("semver");
|
|
5
|
+
class customVersionAction extends release_1.VersionActions {
|
|
5
6
|
async readCurrentVersionFromSourceManifest(tree) {
|
|
6
7
|
return {
|
|
7
8
|
currentVersion: '0.0.0',
|
|
@@ -45,7 +46,7 @@ export default class customVersionAction extends VersionActions {
|
|
|
45
46
|
const expectedPattern = formatDate();
|
|
46
47
|
return !currentVersion.startsWith(expectedPattern)
|
|
47
48
|
? `${expectedPattern}0`
|
|
48
|
-
: inc(currentVersion, 'patch');
|
|
49
|
+
: (0, semver_1.inc)(currentVersion, 'patch');
|
|
49
50
|
}
|
|
50
51
|
return {
|
|
51
52
|
newVersion: getNewVersionFromCurrentVersion(currentVersion),
|
|
@@ -53,4 +54,5 @@ export default class customVersionAction extends VersionActions {
|
|
|
53
54
|
};
|
|
54
55
|
}
|
|
55
56
|
}
|
|
57
|
+
exports.default = customVersionAction;
|
|
56
58
|
//# sourceMappingURL=version-action.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-action.js","sourceRoot":"","sources":["../../../src/scripts/version-action.ts"],"names":[],"mappings":"AACA,
|
|
1
|
+
{"version":3,"file":"version-action.js","sourceRoot":"","sources":["../../../src/scripts/version-action.ts"],"names":[],"mappings":";;AACA,wCAA2C;AAE3C,mCAA4B;AAE5B,MAAqB,mBAAoB,SAAQ,wBAAc;IAE7D,KAAK,CAAC,oCAAoC,CACxC,IAAU;QAEV,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,YAAY,EAAE,+BAA+B;SAC9C,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,8BAA+F;QAE/F,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,OAAO,EAAE,+BAA+B;SACzC,CAAA;IACH,CAAC;IACD,KAAK,CAAC,8BAA8B,CAClC,IAAU,EACV,YAA0B,EAC1B,qBAA6B;QAK7B,OAAO;YACL,cAAc,EAAE,OAAO;YACvB,oBAAoB,EAAE,OAAO;SAC9B,CAAA;IACH,CAAC;IACD,KAAK,CAAC,yBAAyB,CAAC,gBAAwB;QACtD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,KAAK,CAAC,oBAAoB,CACxB,IAAU,EACV,UAAkB;QAElB,yCAAyC;QACzC,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAA;QACjD,MAAM,eAAe,GAAG,aAAa,cAAc,UAAU,CAAA;QAC7D,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;QACvC,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,yBAAyB,CAC7B,IAAU,EACV,YAA0B,EAC1B,oBAA4C;QAE5C,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,mBAAmB,CACvB,cAA6B,EAC7B,eAAuB,EACvB,qBAA6B,EAC7B,yBAAkD,EAClD,KAAa;QAKb,SAAS,UAAU;YACjB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAA;YACvB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;YAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA,CAAC,0BAA0B;YACrF,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;YAE1B,OAAO,GAAG,IAAI,GAAG,KAAK,IAAI,GAAG,GAAG,CAAA;QAClC,CAAC;QAED,SAAS,+BAA+B,CAAC,cAAsB;YAC7D,MAAM,eAAe,GAAG,UAAU,EAAE,CAAA;YACpC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,eAAe,CAAC;gBAChD,CAAC,CAAC,GAAG,eAAe,GAAG;gBACvB,CAAC,CAAC,IAAA,YAAG,EAAC,cAAc,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC;QAED,OAAO;YACL,UAAU,EAAE,+BAA+B,CAAC,cAAc,CAAC;YAC3D,OAAO,EAAE,gBAAgB,+BAA+B,CAAC,cAAc,CAAC,EAAE;SAC3E,CAAA;IACH,CAAC;CACF;AAnFD,sCAmFC"}
|
|
@@ -1,10 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getProfileName = getProfileName;
|
|
4
|
+
exports.getAwsCredentialsSet = getAwsCredentialsSet;
|
|
5
|
+
exports.getAuthWithOidcProfile = getAuthWithOidcProfile;
|
|
6
|
+
exports.loginToEcr = loginToEcr;
|
|
7
|
+
exports.checkAwsAuth = checkAwsAuth;
|
|
8
|
+
exports.pushImageToEcr = pushImageToEcr;
|
|
9
|
+
const docker_1 = require("./docker");
|
|
10
|
+
const exec_1 = require("./exec");
|
|
3
11
|
let profileName = 'OIDC-PROFILE';
|
|
4
12
|
/**
|
|
5
13
|
* Return the AWS profile name to use in AWS cli commands
|
|
6
14
|
*/
|
|
7
|
-
|
|
15
|
+
function getProfileName() {
|
|
8
16
|
return profileName;
|
|
9
17
|
}
|
|
10
18
|
/**
|
|
@@ -17,7 +25,7 @@ export function getProfileName() {
|
|
|
17
25
|
* @return {string} return.secretAccessKey The AWS Secret Access Key.
|
|
18
26
|
* @return {string} return.region The AWS Region.
|
|
19
27
|
*/
|
|
20
|
-
|
|
28
|
+
function getAwsCredentialsSet() {
|
|
21
29
|
const accessKeyId = process.env.AWS_ACCESS_KEY_ID;
|
|
22
30
|
const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY;
|
|
23
31
|
const region = process.env.AWS_DEFAULT_REGION;
|
|
@@ -35,9 +43,9 @@ export function getAwsCredentialsSet() {
|
|
|
35
43
|
*
|
|
36
44
|
* @return {Promise<string | boolean>} The authentication details if the profile exists, or false if the profile does not exist.
|
|
37
45
|
*/
|
|
38
|
-
|
|
46
|
+
async function getAuthWithOidcProfile() {
|
|
39
47
|
try {
|
|
40
|
-
const profileExist = await exec_command(`aws configure list-profiles | grep ${profileName}`);
|
|
48
|
+
const profileExist = await (0, exec_1.exec_command)(`aws configure list-profiles | grep ${profileName}`);
|
|
41
49
|
if (profileExist.success) {
|
|
42
50
|
return profileExist.stdout;
|
|
43
51
|
}
|
|
@@ -48,14 +56,14 @@ export async function getAuthWithOidcProfile() {
|
|
|
48
56
|
return false;
|
|
49
57
|
}
|
|
50
58
|
}
|
|
51
|
-
|
|
52
|
-
return exec_command(`aws ecr get-login-password --profile ${profileName} --region eu-west-3 | ${await getDockerOrPodman()} login --username AWS --password-stdin ${process.env.AWS_ECR_REGISTRY}`);
|
|
59
|
+
async function loginToEcr() {
|
|
60
|
+
return (0, exec_1.exec_command)(`aws ecr get-login-password --profile ${profileName} --region eu-west-3 | ${await (0, docker_1.getDockerOrPodman)()} login --username AWS --password-stdin ${process.env.AWS_ECR_REGISTRY}`);
|
|
53
61
|
}
|
|
54
62
|
/**
|
|
55
63
|
* Check AWS CLI with the OIDC profile otherwise use the default credentials
|
|
56
64
|
* @returns {string} the profile's name
|
|
57
65
|
*/
|
|
58
|
-
|
|
66
|
+
async function checkAwsAuth() {
|
|
59
67
|
const profileExist = await getAuthWithOidcProfile();
|
|
60
68
|
if (profileExist) {
|
|
61
69
|
console.log('OIDC profile found, using it');
|
|
@@ -70,7 +78,7 @@ export async function checkAwsAuth() {
|
|
|
70
78
|
}
|
|
71
79
|
return profileName;
|
|
72
80
|
}
|
|
73
|
-
|
|
74
|
-
return exec_command(`docker push ${process.env.AWS_ECR_REGISTRY}/${repositoryName}:${version}`);
|
|
81
|
+
function pushImageToEcr(repositoryName, version) {
|
|
82
|
+
return (0, exec_1.exec_command)(`docker push ${process.env.AWS_ECR_REGISTRY}/${repositoryName}:${version}`);
|
|
75
83
|
}
|
|
76
84
|
//# sourceMappingURL=aws-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../src/utils/aws-auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../src/utils/aws-auth.ts"],"names":[],"mappings":";;AAQA,wCAEC;AAYD,oDAmBC;AAQD,wDAaC;AAED,gCAIC;AAMD,oCAgBC;AAED,wCAOC;AAnGD,qCAA4C;AAC5C,iCAAqC;AAErC,IAAI,WAAW,GAAG,cAAc,CAAA;AAEhC;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,oBAAoB;IAKlC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAA;IACjD,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAA;IACzD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAA;IAC7C,IAAI,CAAC,WAAW,IAAI,CAAC,eAAe,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,kKAAkK,CACnK,CAAA;IACH,CAAC;IACD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACb,mIAAmI,CACpI,CAAA;IACH,CAAC;IACD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,sBAAsB;IAC1C,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAY,EACrC,sCAAsC,WAAW,EAAE,CACpD,CAAA;QACD,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,YAAY,CAAC,MAAM,CAAA;QAC5B,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAChB,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU;IAC9B,OAAO,IAAA,mBAAY,EACjB,wCAAwC,WAAW,yBAAyB,MAAM,IAAA,0BAAiB,GAAE,0CAA0C,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAC9K,CAAA;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,YAAY,GAAG,MAAM,sBAAsB,EAAE,CAAA;IACnD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,WAAW,GAAG,cAAc,CAAA;IAC9B,CAAC;SAAM,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAA;QACD,WAAW,GAAG,SAAS,CAAA;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CACb,iLAAiL,CAClL,CAAA;IACH,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,SAAgB,cAAc,CAC5B,cAAsB,EACtB,OAAe;IAEf,OAAO,IAAA,mBAAY,EACjB,eAAe,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,cAAc,IAAI,OAAO,EAAE,CAC3E,CAAA;AACH,CAAC"}
|
package/dist/src/utils/docker.js
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDockerOrPodman = getDockerOrPodman;
|
|
4
|
+
exports.buildDockerImage = buildDockerImage;
|
|
5
|
+
const exec_1 = require("./exec");
|
|
2
6
|
/**
|
|
3
7
|
* Determines the available container management tool by checking for Docker and fallback to Podman if Docker is unavailable.
|
|
4
8
|
*
|
|
5
9
|
* @return {Promise<string>} A promise that resolves to the string 'docker' if Docker is available, or 'podman' if Podman is used as a fallback.
|
|
6
10
|
*/
|
|
7
|
-
|
|
11
|
+
async function getDockerOrPodman() {
|
|
8
12
|
try {
|
|
9
|
-
await exec_command('docker --version');
|
|
13
|
+
await (0, exec_1.exec_command)('docker --version');
|
|
10
14
|
return 'docker';
|
|
11
15
|
}
|
|
12
16
|
catch (e) {
|
|
@@ -22,8 +26,8 @@ export async function getDockerOrPodman() {
|
|
|
22
26
|
* @param version The version of the image to build.
|
|
23
27
|
* @return {Promise<{success: boolean, stdout: string, stderr: string}>} A promise that resolves to an object containing the success status, stdout, and stderr of the command.
|
|
24
28
|
*/
|
|
25
|
-
|
|
29
|
+
async function buildDockerImage(imageName, dockerfilePath, version) {
|
|
26
30
|
const dockerOrPodman = await getDockerOrPodman();
|
|
27
|
-
return exec_command(`${dockerOrPodman} buildx build -t ${process.env.AWS_ECR_REGISTRY}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN .`);
|
|
31
|
+
return (0, exec_1.exec_command)(`${dockerOrPodman} buildx build -t ${process.env.AWS_ECR_REGISTRY}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN .`);
|
|
28
32
|
}
|
|
29
33
|
//# sourceMappingURL=docker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;AAOA,8CAQC;AAUD,4CASC;AAlCD,iCAAqC;AAErC;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,mBAAY,EAAC,kBAAkB,CAAC,CAAA;QACtC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe;IAEf,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,mBAAY,EACjB,GAAG,cAAc,oBAAoB,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,2BAA2B,CAC1I,CAAA;AACH,CAAC"}
|
package/dist/src/utils/exec.js
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.execTiny = void 0;
|
|
4
|
+
exports.exec_command = exec_command;
|
|
5
|
+
const child_process_1 = require("child_process");
|
|
6
|
+
const util_1 = require("util");
|
|
7
|
+
const tinyexec_1 = require("tinyexec");
|
|
8
|
+
async function exec_command(command) {
|
|
9
|
+
const { stdout, stderr } = await (0, util_1.promisify)(child_process_1.exec)(command);
|
|
6
10
|
console.log(stdout);
|
|
7
11
|
console.error(stderr);
|
|
8
12
|
const success = !stderr;
|
|
@@ -17,5 +21,5 @@ function createLoggingExecWrapper(execFn) {
|
|
|
17
21
|
});
|
|
18
22
|
};
|
|
19
23
|
}
|
|
20
|
-
|
|
24
|
+
exports.execTiny = createLoggingExecWrapper(tinyexec_1.x);
|
|
21
25
|
//# sourceMappingURL=exec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/utils/exec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/utils/exec.ts"],"names":[],"mappings":";;;AAOA,oCAOC;AAdD,iDAAoC;AACpC,+BAAgC;AAIhC,uCAA4B;AAErB,KAAK,UAAU,YAAY,CAAC,OAAe;IAChD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC,OAAO,CAAC,CAAA;IACzD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAErB,MAAM,OAAO,GAAG,CAAC,MAAM,CAAA;IACvB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACpC,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,CAAC,GAAG,CAAC,YAAY,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACxD,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE;YAC3B,YAAY,EAAE,IAAI;YAClB,GAAG,OAAO;SACX,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAEY,QAAA,QAAQ,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getVersion = getVersion;
|
|
4
|
+
const fs = require("node:fs");
|
|
2
5
|
/**
|
|
3
6
|
* Get the version of a project
|
|
4
7
|
* @param projectName
|
|
5
8
|
* @returns {string}
|
|
6
9
|
*/
|
|
7
|
-
|
|
10
|
+
function getVersion(projectName) {
|
|
8
11
|
const versionFilePath = `dist/apps/${projectName}/VERSION`;
|
|
9
12
|
return fs.readFileSync(versionFilePath, 'utf8');
|
|
10
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-version.js","sourceRoot":"","sources":["../../../src/utils/get-version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-version.js","sourceRoot":"","sources":["../../../src/utils/get-version.ts"],"names":[],"mappings":";;AAOA,gCAGC;AAVD,8BAA6B;AAE7B;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,MAAM,eAAe,GAAG,aAAa,WAAW,UAAU,CAAA;IAC1D,OAAO,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;AACjD,CAAC"}
|
package/dist/src/utils/github.js
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getSanitizedCurrentGitBranch = getSanitizedCurrentGitBranch;
|
|
4
|
+
const exec_1 = require("./exec");
|
|
2
5
|
/**
|
|
3
6
|
* Get sanitized current git branch name
|
|
4
7
|
*/
|
|
5
|
-
|
|
6
|
-
const branchName = await exec_command(`git branch --show-current`);
|
|
8
|
+
async function getSanitizedCurrentGitBranch() {
|
|
9
|
+
const branchName = await (0, exec_1.exec_command)(`git branch --show-current`);
|
|
7
10
|
return branchName.success
|
|
8
11
|
? branchName.stdout
|
|
9
12
|
.trim()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/utils/github.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAbD,iCAAqC;AAErC;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,2BAA2B,CAAC,CAAA;IAClE,OAAO,UAAU,CAAC,OAAO;QACvB,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAA;AACR,CAAC"}
|
package/dist/src/utils/helm.js
CHANGED
|
@@ -1,24 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getHelmChartFile = getHelmChartFile;
|
|
4
|
+
exports.setupTeleportProxyHelmChartFile = setupTeleportProxyHelmChartFile;
|
|
5
|
+
exports.resetTeleportProxyHelmChartFile = resetTeleportProxyHelmChartFile;
|
|
6
|
+
exports.installHelmRepo = installHelmRepo;
|
|
7
|
+
exports.packageHelm = packageHelm;
|
|
8
|
+
exports.pushPackagedHelm = pushPackagedHelm;
|
|
9
|
+
const fs = require("node:fs");
|
|
10
|
+
const process = require("node:process");
|
|
11
|
+
const yaml_1 = require("yaml");
|
|
12
|
+
const aws_auth_1 = require("./aws-auth");
|
|
13
|
+
const exec_1 = require("./exec");
|
|
6
14
|
const tshProxy = 'http://localhost';
|
|
7
15
|
/**
|
|
8
16
|
* Read & parse the Helm chart.yaml file
|
|
9
17
|
* @param helmFolderPath
|
|
10
18
|
*/
|
|
11
|
-
|
|
12
|
-
return parse(fs.readFileSync(`${helmFolderPath}/Chart.yaml`, 'utf8'));
|
|
19
|
+
async function getHelmChartFile(helmFolderPath) {
|
|
20
|
+
return (0, yaml_1.parse)(fs.readFileSync(`${helmFolderPath}/Chart.yaml`, 'utf8'));
|
|
13
21
|
}
|
|
14
22
|
/**
|
|
15
23
|
* Prepare the Chart.yaml config file for the Tsh proxy
|
|
16
24
|
* @param helmFolderPath
|
|
17
25
|
* @param tshPort
|
|
18
26
|
*/
|
|
19
|
-
|
|
27
|
+
async function setupTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
|
|
20
28
|
console.log(`Replacing charts.shared.payfit.tech -> localhost:${tshPort} for the Teleport proxy`);
|
|
21
|
-
let chartConfigStr = stringify(await getHelmChartFile(helmFolderPath));
|
|
29
|
+
let chartConfigStr = (0, yaml_1.stringify)(await getHelmChartFile(helmFolderPath));
|
|
22
30
|
chartConfigStr = chartConfigStr.replace(/(https?:\/\/)charts(\.shared)?\.payfit\.tech/gi, `${tshProxy}:${tshPort}`);
|
|
23
31
|
return fs.writeFileSync(`${helmFolderPath}/Chart.yaml`, chartConfigStr);
|
|
24
32
|
}
|
|
@@ -27,8 +35,8 @@ export async function setupTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
|
|
|
27
35
|
* @param helmFolderPath
|
|
28
36
|
* @param tshPort
|
|
29
37
|
*/
|
|
30
|
-
|
|
31
|
-
let chartConfigStr = stringify(await getHelmChartFile(helmFolderPath));
|
|
38
|
+
async function resetTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
|
|
39
|
+
let chartConfigStr = (0, yaml_1.stringify)(await getHelmChartFile(helmFolderPath));
|
|
32
40
|
chartConfigStr = chartConfigStr.replace(`${tshProxy}:${tshPort}`, 'https://charts.shared.payfit.tech');
|
|
33
41
|
return fs.writeFileSync(`${helmFolderPath}/Chart.yaml`, chartConfigStr);
|
|
34
42
|
}
|
|
@@ -36,7 +44,7 @@ export async function resetTeleportProxyHelmChartFile(helmFolderPath, tshPort) {
|
|
|
36
44
|
* Install all the helm repositories defined in the Chart config
|
|
37
45
|
* @param helmFolderPath
|
|
38
46
|
*/
|
|
39
|
-
|
|
47
|
+
async function installHelmRepo(helmFolderPath) {
|
|
40
48
|
const chartConfig = await getHelmChartFile(helmFolderPath);
|
|
41
49
|
if (chartConfig.dependencies) {
|
|
42
50
|
for (let i = 0; i < chartConfig.dependencies.length; i++) {
|
|
@@ -48,15 +56,15 @@ export async function installHelmRepo(helmFolderPath) {
|
|
|
48
56
|
if (!process.env.CHARTMUSEUM_USERNAME ||
|
|
49
57
|
!process.env.CHARTMUSEUM_PASSWORD)
|
|
50
58
|
throw new Error('Missing CHARTMUSEUM_USERNAME, CHARTMUSEUM_PASSWORD in environment!');
|
|
51
|
-
await exec_command(`helm repo add --username '${process.env.CHARTMUSEUM_USERNAME}' --password '${process.env.CHARTMUSEUM_PASSWORD}' '${repoName}' '${dep.repository}' --force-update`);
|
|
59
|
+
await (0, exec_1.exec_command)(`helm repo add --username '${process.env.CHARTMUSEUM_USERNAME}' --password '${process.env.CHARTMUSEUM_PASSWORD}' '${repoName}' '${dep.repository}' --force-update`);
|
|
52
60
|
}
|
|
53
61
|
else {
|
|
54
|
-
await exec_command(`helm repo add '${repoName}' '${dep.repository}' --force-update`);
|
|
62
|
+
await (0, exec_1.exec_command)(`helm repo add '${repoName}' '${dep.repository}' --force-update`);
|
|
55
63
|
}
|
|
56
|
-
await exec_command(`helm repo update ${repoName}`);
|
|
64
|
+
await (0, exec_1.exec_command)(`helm repo update ${repoName}`);
|
|
57
65
|
}
|
|
58
66
|
}
|
|
59
|
-
return exec_command(`helm dependency update ${helmFolderPath}`);
|
|
67
|
+
return (0, exec_1.exec_command)(`helm dependency update ${helmFolderPath}`);
|
|
60
68
|
}
|
|
61
69
|
/**
|
|
62
70
|
* Package the Helm chart
|
|
@@ -64,8 +72,8 @@ export async function installHelmRepo(helmFolderPath) {
|
|
|
64
72
|
* @param version
|
|
65
73
|
* @param destinationPath
|
|
66
74
|
*/
|
|
67
|
-
|
|
68
|
-
return exec_command(`helm package ${helmFolderPath} --version ${version} --destination ${destinationPath}`);
|
|
75
|
+
async function packageHelm(helmFolderPath, version, destinationPath) {
|
|
76
|
+
return (0, exec_1.exec_command)(`helm package ${helmFolderPath} --version ${version} --destination ${destinationPath}`);
|
|
69
77
|
}
|
|
70
78
|
/**
|
|
71
79
|
* Push the packaged Helm chart in the chartmuseum
|
|
@@ -73,11 +81,11 @@ export async function packageHelm(helmFolderPath, version, destinationPath) {
|
|
|
73
81
|
* @param projectName
|
|
74
82
|
* @param branch
|
|
75
83
|
*/
|
|
76
|
-
|
|
84
|
+
async function pushPackagedHelm(packagedHelmChartFilePath, projectName, branch) {
|
|
77
85
|
if (!process.env.CHARTMUSEUM_BUCKET_NAME)
|
|
78
86
|
throw new Error('Missing CHARTMUSEUM_BUCKET_NAME in environment!');
|
|
79
87
|
// aws s3api put-object-tagging --bucket ${process.env.CHARTMUSEUM_BUCKET_NAME} --key ${projectName}/${branch}/${packagedHelmChartFilePath} --tagging '{"TagSet": [{ "Key": "auto-purge", "Value": "false" }]}' // todo
|
|
80
|
-
const profile = getProfileName() === 'default' ? '' : `--profile ${getProfileName()}`;
|
|
81
|
-
return exec_command(`aws s3 cp ${profile} --sse AES256 ${packagedHelmChartFilePath} s3://${process.env.CHARTMUSEUM_BUCKET_NAME}/${projectName}/${branch}/`);
|
|
88
|
+
const profile = (0, aws_auth_1.getProfileName)() === 'default' ? '' : `--profile ${(0, aws_auth_1.getProfileName)()}`;
|
|
89
|
+
return (0, exec_1.exec_command)(`aws s3 cp ${profile} --sse AES256 ${packagedHelmChartFilePath} s3://${process.env.CHARTMUSEUM_BUCKET_NAME}/${projectName}/${branch}/`);
|
|
82
90
|
}
|
|
83
91
|
//# sourceMappingURL=helm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../src/utils/helm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.importKy = importKy;
|
|
4
|
+
exports.importGetPort = importGetPort;
|
|
1
5
|
// Needed since we have to have dynamic import to esm module, since we are stuck with cjs on the nx tool runner
|
|
2
|
-
|
|
6
|
+
function importKy() {
|
|
3
7
|
return Function('return import("ky")')();
|
|
4
8
|
}
|
|
5
|
-
|
|
9
|
+
function importGetPort() {
|
|
6
10
|
return Function('return import("get-port")')();
|
|
7
11
|
}
|
|
8
12
|
//# sourceMappingURL=import-esm.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-esm.js","sourceRoot":"","sources":["../../../src/utils/import-esm.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"import-esm.js","sourceRoot":"","sources":["../../../src/utils/import-esm.ts"],"names":[],"mappings":";;AACA,4BAEC;AAED,sCAIC;AATD,+GAA+G;AAC/G,SAAgB,QAAQ;IACtB,OAAO,QAAQ,CAAC,qBAAqB,CAAC,EAAkC,CAAA;AAC1E,CAAC;AAED,SAAgB,aAAa;IAC3B,OAAO,QAAQ,CAAC,2BAA2B,CAAC,EAE3C,CAAA;AACH,CAAC"}
|
package/dist/src/utils/tsh.js
CHANGED
|
@@ -1,21 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getLocalPortForChartMuseum = void 0;
|
|
4
|
+
exports.isLoggedInToTsh = isLoggedInToTsh;
|
|
5
|
+
exports.ensureIsLoggedInToTsh = ensureIsLoggedInToTsh;
|
|
6
|
+
exports.isConnectedToChartMuseum = isConnectedToChartMuseum;
|
|
7
|
+
exports.ensureAppIsChartMuseum = ensureAppIsChartMuseum;
|
|
8
|
+
const workspace_root_1 = require("nx/src/utils/workspace-root");
|
|
9
|
+
const zod_1 = require("zod");
|
|
10
|
+
const exec_1 = require("./exec");
|
|
11
|
+
const import_esm_1 = require("./import-esm");
|
|
5
12
|
const expectedProfileUrl = 'https://payfit.teleport.sh:443';
|
|
6
13
|
const expectedAppName = 'charts-shared';
|
|
7
|
-
const profile = z.object({
|
|
8
|
-
profile_url: z.string(),
|
|
14
|
+
const profile = zod_1.z.object({
|
|
15
|
+
profile_url: zod_1.z.string(),
|
|
9
16
|
});
|
|
10
|
-
const statusSchema = z.object({
|
|
17
|
+
const statusSchema = zod_1.z.object({
|
|
11
18
|
active: profile,
|
|
12
|
-
profiles: z.array(profile).optional(),
|
|
19
|
+
profiles: zod_1.z.array(profile).optional(),
|
|
13
20
|
});
|
|
14
21
|
const getStatusOfTsh = async () => {
|
|
15
|
-
const { stdout } = await execTiny('tsh', `status -f json`.split(' '));
|
|
22
|
+
const { stdout } = await (0, exec_1.execTiny)('tsh', `status -f json`.split(' '));
|
|
16
23
|
return statusSchema.parse(JSON.parse(stdout));
|
|
17
24
|
};
|
|
18
|
-
|
|
25
|
+
async function isLoggedInToTsh() {
|
|
19
26
|
try {
|
|
20
27
|
const status = await getStatusOfTsh();
|
|
21
28
|
return status.active.profile_url === expectedProfileUrl;
|
|
@@ -24,22 +31,22 @@ export async function isLoggedInToTsh() {
|
|
|
24
31
|
return false;
|
|
25
32
|
}
|
|
26
33
|
}
|
|
27
|
-
|
|
34
|
+
async function ensureIsLoggedInToTsh() {
|
|
28
35
|
if (await isLoggedInToTsh()) {
|
|
29
36
|
return true;
|
|
30
37
|
}
|
|
31
|
-
await execTiny('tsh', `login --proxy=${expectedProfileUrl} --auth=okta`.split(' '), {
|
|
38
|
+
await (0, exec_1.execTiny)('tsh', `login --proxy=${expectedProfileUrl} --auth=okta`.split(' '), {
|
|
32
39
|
throwOnError: true,
|
|
33
40
|
});
|
|
34
41
|
return await isLoggedInToTsh();
|
|
35
42
|
}
|
|
36
43
|
const getAppConfigOfTsh = async () => {
|
|
37
|
-
const { stdout } = await execTiny('tsh', `apps config -f json --proxy=${expectedProfileUrl} ${expectedAppName}`.split(' '), {
|
|
44
|
+
const { stdout } = await (0, exec_1.execTiny)('tsh', `apps config -f json --proxy=${expectedProfileUrl} ${expectedAppName}`.split(' '), {
|
|
38
45
|
throwOnError: true,
|
|
39
46
|
});
|
|
40
47
|
return JSON.parse(stdout);
|
|
41
48
|
};
|
|
42
|
-
|
|
49
|
+
async function isConnectedToChartMuseum() {
|
|
43
50
|
try {
|
|
44
51
|
const apps = await getAppConfigOfTsh();
|
|
45
52
|
return apps.name === expectedAppName;
|
|
@@ -48,29 +55,29 @@ export async function isConnectedToChartMuseum() {
|
|
|
48
55
|
return false;
|
|
49
56
|
}
|
|
50
57
|
}
|
|
51
|
-
|
|
58
|
+
async function ensureAppIsChartMuseum() {
|
|
52
59
|
if (await isConnectedToChartMuseum()) {
|
|
53
60
|
return true;
|
|
54
61
|
}
|
|
55
|
-
await execTiny('tsh', `apps login ${expectedAppName} --proxy=${expectedProfileUrl}`.split(' '), {
|
|
62
|
+
await (0, exec_1.execTiny)('tsh', `apps login ${expectedAppName} --proxy=${expectedProfileUrl}`.split(' '), {
|
|
56
63
|
throwOnError: true,
|
|
57
64
|
});
|
|
58
65
|
return await isConnectedToChartMuseum();
|
|
59
66
|
}
|
|
60
|
-
|
|
67
|
+
const getLocalPortForChartMuseum = async () => {
|
|
61
68
|
if (!process.env.CI) {
|
|
62
69
|
await ensureIsLoggedInToTsh();
|
|
63
70
|
await ensureAppIsChartMuseum();
|
|
64
71
|
}
|
|
65
|
-
const { default: getPort } = await importGetPort();
|
|
66
|
-
const { default: ky } = await importKy();
|
|
72
|
+
const { default: getPort } = await (0, import_esm_1.importGetPort)();
|
|
73
|
+
const { default: ky } = await (0, import_esm_1.importKy)();
|
|
67
74
|
const port = await getPort();
|
|
68
75
|
const command = process.env.CI
|
|
69
76
|
? `-i ./certs/identity --proxy payfit.teleport.sh:443 proxy app ${expectedAppName} --port ${port}`
|
|
70
77
|
: `proxy app ${expectedAppName} -p ${port}`;
|
|
71
|
-
const execHandle = execTiny('tsh', command.split(' '), {
|
|
78
|
+
const execHandle = (0, exec_1.execTiny)('tsh', command.split(' '), {
|
|
72
79
|
nodeOptions: {
|
|
73
|
-
cwd: workspaceRoot,
|
|
80
|
+
cwd: workspace_root_1.workspaceRoot,
|
|
74
81
|
},
|
|
75
82
|
});
|
|
76
83
|
const isReady = async () => {
|
|
@@ -96,4 +103,5 @@ export const getLocalPortForChartMuseum = async () => {
|
|
|
96
103
|
port,
|
|
97
104
|
};
|
|
98
105
|
};
|
|
106
|
+
exports.getLocalPortForChartMuseum = getLocalPortForChartMuseum;
|
|
99
107
|
//# sourceMappingURL=tsh.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../src/utils/tsh.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../src/utils/tsh.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payfit/nx-core",
|
|
3
|
-
"version": "4.9.1
|
|
3
|
+
"version": "4.9.1",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
7
|
+
"typings": "dist/src/index.d.ts",
|
|
8
|
+
"repository": {
|
|
9
|
+
"type": "git",
|
|
10
|
+
"url": "https://github.com/payfit/nx-common-packages.git",
|
|
11
|
+
"directory": "packages/nx-core"
|
|
12
|
+
},
|
|
7
13
|
"dependencies": {
|
|
8
14
|
"@nx/devkit": "21.0.3",
|
|
9
15
|
"get-port": "^7.1.0",
|