@payfit/nx-core 4.34.0-ephemeral-hello-lambda-7f13dc6.0 → 4.34.1-ephemeral-bugfix-docker-push-annotations-f7320e7.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/package.json +1 -1
- package/src/executors/publisher/docker.js +9 -16
- package/src/executors/publisher/docker.js.map +1 -1
- package/src/executors/publisher/executor.js +1 -3
- package/src/executors/publisher/executor.js.map +1 -1
- package/src/executors/publisher/helm.js +7 -6
- package/src/executors/publisher/helm.js.map +1 -1
- package/src/executors/publisher/schema.d.ts +2 -2
- package/src/executors/publisher/schema.json +10 -6
- package/src/executors/release/executor.js +10 -6
- package/src/executors/release/executor.js.map +1 -1
- package/src/executors/release/schema.d.ts +2 -0
- package/src/executors/release/schema.json +11 -0
- package/src/generators/init/files/.circleci/config.yml +6 -11
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/index.d.ts +6 -1
- package/src/index.js +10 -12
- package/src/index.js.map +1 -1
- package/src/scripts/version-actions.js +1 -1
- package/src/scripts/version-actions.js.map +1 -1
- package/src/utils/{common/aws-auth.d.ts → aws-auth.d.ts} +0 -1
- package/src/utils/{common/aws-auth.js → aws-auth.js} +20 -39
- package/src/utils/aws-auth.js.map +1 -0
- package/src/utils/circleci.js.map +1 -0
- package/src/utils/docker.d.ts +10 -19
- package/src/utils/docker.js +66 -50
- package/src/utils/docker.js.map +1 -1
- package/src/utils/exec.js.map +1 -0
- package/src/utils/github.js.map +1 -0
- package/src/utils/helm.js +3 -3
- package/src/utils/helm.js.map +1 -1
- package/src/utils/import-esm.js.map +1 -0
- package/src/utils/logger.js.map +1 -0
- package/src/utils/nx.js.map +1 -0
- package/src/utils/tsh.js.map +1 -0
- package/src/executors/publisher/lambda.d.ts +0 -3
- package/src/executors/publisher/lambda.js +0 -35
- package/src/executors/publisher/lambda.js.map +0 -1
- package/src/utils/common/aws-auth.js.map +0 -1
- package/src/utils/common/circleci.js.map +0 -1
- package/src/utils/common/exec.js.map +0 -1
- package/src/utils/common/github.js.map +0 -1
- package/src/utils/common/import-esm.js.map +0 -1
- package/src/utils/common/logger.js.map +0 -1
- package/src/utils/common/nx.js.map +0 -1
- package/src/utils/common/s3.d.ts +0 -1
- package/src/utils/common/s3.js +0 -18
- package/src/utils/common/s3.js.map +0 -1
- package/src/utils/common/tsh.js.map +0 -1
- package/src/utils/lambda/lambda.d.ts +0 -1
- package/src/utils/lambda/lambda.js +0 -14
- package/src/utils/lambda/lambda.js.map +0 -1
- package/src/utils/lambda/oci.d.ts +0 -1
- package/src/utils/lambda/oci.js +0 -18
- package/src/utils/lambda/oci.js.map +0 -1
- /package/src/utils/{common/circleci.d.ts → circleci.d.ts} +0 -0
- /package/src/utils/{common/circleci.js → circleci.js} +0 -0
- /package/src/utils/{common/exec.d.ts → exec.d.ts} +0 -0
- /package/src/utils/{common/exec.js → exec.js} +0 -0
- /package/src/utils/{common/github.d.ts → github.d.ts} +0 -0
- /package/src/utils/{common/github.js → github.js} +0 -0
- /package/src/utils/{common/import-esm.d.ts → import-esm.d.ts} +0 -0
- /package/src/utils/{common/import-esm.js → import-esm.js} +0 -0
- /package/src/utils/{common/logger.d.ts → logger.d.ts} +0 -0
- /package/src/utils/{common/logger.js → logger.js} +0 -0
- /package/src/utils/{common/nx.d.ts → nx.d.ts} +0 -0
- /package/src/utils/{common/nx.js → nx.js} +0 -0
- /package/src/utils/{common/tsh.d.ts → tsh.d.ts} +0 -0
- /package/src/utils/{common/tsh.js → tsh.js} +0 -0
package/package.json
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.publishDocker = publishDocker;
|
|
4
4
|
const fs = require("node:fs");
|
|
5
|
-
const aws_auth_1 = require("../../utils/
|
|
6
|
-
const github_1 = require("../../utils/common/github");
|
|
7
|
-
const logger_1 = require("../../utils/common/logger");
|
|
5
|
+
const aws_auth_1 = require("../../utils/aws-auth");
|
|
8
6
|
const docker_1 = require("../../utils/docker");
|
|
7
|
+
const github_1 = require("../../utils/github");
|
|
8
|
+
const logger_1 = require("../../utils/logger");
|
|
9
9
|
async function publishDocker(options, context, version, projectRoot) {
|
|
10
10
|
const projectDockerfile = `${projectRoot}/Dockerfile`;
|
|
11
11
|
if (!fs.existsSync(projectDockerfile)) {
|
|
@@ -39,18 +39,11 @@ async function publishDocker(options, context, version, projectRoot) {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
logger_1.consola.box(`Publishing docker image to ${registry.url}/${options.ecrRegistry} with version ${version}`);
|
|
42
|
-
logger_1.consola.start('Building docker image');
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
await (0, docker_1.
|
|
47
|
-
logger_1.consola.success('Docker image pushed successfully!');
|
|
48
|
-
// If the image is public, and the version is not ephemeral, we need to tag it as latest
|
|
49
|
-
if (options.isPublicRegistry && !version.includes('ephemeral')) {
|
|
50
|
-
logger_1.consola.start('Tagging docker image as latest');
|
|
51
|
-
await (0, docker_1.tagLatestImage)(options.ecrRegistry, version, registry.url);
|
|
52
|
-
await (0, docker_1.pushImageToEcr)(options.ecrRegistry, 'latest', registry.url);
|
|
53
|
-
logger_1.consola.success('Docker image tagged as latest successfully!');
|
|
54
|
-
}
|
|
42
|
+
logger_1.consola.start('Building and pushing docker image');
|
|
43
|
+
const extraTags = !version.includes('ephemeral') && options.extraReleaseTags
|
|
44
|
+
? options.extraReleaseTags
|
|
45
|
+
: [];
|
|
46
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRegistry, projectDockerfile, version, await (0, github_1.getSanitizedCurrentGitRepoUrl)(), await (0, github_1.getCurrentGitCommitSha)(), registry.url, extraTags);
|
|
47
|
+
logger_1.consola.success('Docker image built and pushed successfully!');
|
|
55
48
|
}
|
|
56
49
|
//# sourceMappingURL=docker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAsBA,sCAsEC;AA5FD,8BAA6B;AAI7B,mDAI6B;AAC7B,+CAA4D;AAC5D,+CAG2B;AAC3B,+CAA4C;AAQrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAEnB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,YAAY,CAAC,CAAA;QACtE,OAAM;IACR,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,gBAAgB;YAC3B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAChC,IAAI,EAAE,OAAO,CAAC,gBAAgB;YAC5B,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;KACjC,CAAA;IAED,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAEzD,8DAA8D;IAC9D,MAAM,mBAAmB,GAAG,MAAM,IAAA,+BAAoB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACrE,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,gBAAO,CAAC,IAAI,CACV,mEAAmE,CACpE,CAAA;QACD,uBAAuB;QACvB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;QAEzD,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAoB,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAClE,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAA;QACH,CAAC;IACH,CAAC;IAED,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5F,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAA;IAElD,MAAM,SAAS,GACb,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,gBAAgB;QACxD,CAAC,CAAC,OAAO,CAAC,gBAAgB;QAC1B,CAAC,CAAC,EAAE,CAAA;IAER,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CAAC,GAAG,EACZ,SAAS,CACV,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAA;AAChE,CAAC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const nx_1 = require("../../utils/
|
|
3
|
+
const nx_1 = require("../../utils/nx");
|
|
4
4
|
const docker_1 = require("./docker");
|
|
5
5
|
const helm_1 = require("./helm");
|
|
6
|
-
const lambda_1 = require("./lambda");
|
|
7
6
|
const runExecutor = async (options, context) => {
|
|
8
7
|
const projectGraph = (0, nx_1.getProjectFromGraph)(context);
|
|
9
8
|
const projectRoot = projectGraph.data.root;
|
|
@@ -11,7 +10,6 @@ const runExecutor = async (options, context) => {
|
|
|
11
10
|
const version = (0, nx_1.getVersion)(projectDist);
|
|
12
11
|
await (0, docker_1.publishDocker)(options, context, version, projectRoot);
|
|
13
12
|
await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist);
|
|
14
|
-
await (0, lambda_1.publishLambda)(options, context, version, projectRoot, projectDist);
|
|
15
13
|
return {
|
|
16
14
|
success: true,
|
|
17
15
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAGA,uCAA+E;AAC/E,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;IACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;IAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;IAEvC,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,CAAA;IAC3D,MAAM,IAAA,kBAAW,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IAEtE,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.publishHelm = publishHelm;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = require("node:fs");
|
|
6
|
-
const aws_auth_1 = require("../../utils/
|
|
7
|
-
const github_1 = require("../../utils/
|
|
8
|
-
const logger_1 = require("../../utils/common/logger");
|
|
9
|
-
const tsh_1 = require("../../utils/common/tsh");
|
|
6
|
+
const aws_auth_1 = require("../../utils/aws-auth");
|
|
7
|
+
const github_1 = require("../../utils/github");
|
|
10
8
|
const helm_1 = require("../../utils/helm");
|
|
9
|
+
const logger_1 = require("../../utils/logger");
|
|
10
|
+
const tsh_1 = require("../../utils/tsh");
|
|
11
11
|
async function publishHelm(options, context, version, projectRoot, projectDist) {
|
|
12
12
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
13
13
|
try {
|
|
14
|
-
const
|
|
14
|
+
const helmChartFolder = options.helmChartFolder || '.deploy';
|
|
15
|
+
const projectHelmFolder = `${projectRoot}/${helmChartFolder}`;
|
|
15
16
|
const valuesConfigPath = `${projectHelmFolder}/values.yaml`;
|
|
16
17
|
const chartConfigPath = `${projectHelmFolder}/Chart.yaml`;
|
|
17
18
|
const destinationHelmFolder = `${projectDist}/chart/`;
|
|
@@ -19,7 +20,7 @@ async function publishHelm(options, context, version, projectRoot, projectDist)
|
|
|
19
20
|
if (!gitBranchName)
|
|
20
21
|
throw new Error('Unable to get current Git branch');
|
|
21
22
|
if (!fs.existsSync(projectHelmFolder)) {
|
|
22
|
-
logger_1.consola.warn(
|
|
23
|
+
logger_1.consola.warn(`${helmChartFolder} folder not found at ${projectHelmFolder}, skipping`);
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
25
26
|
if (!options.chartRegistry) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,kCAqEC;;AAzFD,8BAA6B;AAI7B,mDAAmD;AACnD,+CAAiE;AACjE,2CASyB;AACzB,+CAA4C;AAC5C,yCAA4D;AAGrD,KAAK,UAAU,WAAW,CAC/B,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;;;QAEnB,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,SAAS,CAAA;QAC5D,MAAM,iBAAiB,GAAG,GAAG,WAAW,IAAI,eAAe,EAAE,CAAA;QAC7D,MAAM,gBAAgB,GAAG,GAAG,iBAAiB,cAAc,CAAA;QAC3D,MAAM,eAAe,GAAG,GAAG,iBAAiB,aAAa,CAAA;QACzD,MAAM,qBAAqB,GAAG,GAAG,WAAW,SAAS,CAAA;QACrD,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;QAE1D,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAEvE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,gBAAO,CAAC,IAAI,CACV,GAAG,eAAe,wBAAwB,iBAAiB,YAAY,CACxE,CAAA;YACD,OAAM;QACR,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3B,gBAAO,CAAC,KAAK,CACX,uGAAuG,CACxG,CAAA;YACD,OAAM;QACR,CAAC;QAED,MAAM,IAAA,uBAAY,GAAE,CAAA;QAEpB,gBAAO,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,gBAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QACpC,MAAM,IAAA,sCAA+B,EAAC,iBAAiB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAA;QACxE,MAAM,IAAA,sBAAe,EAAC,iBAAiB,CAAC,CAAA;QACxC,MAAM,IAAA,oBAAa,EAAC,gBAAgB,EAAE,eAAe,EAAE,OAAO,CAAC,CAAA;QAC/D,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,gBAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;QAEvC,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAgB,EAAC,iBAAiB,CAAC,CAAA;QAC7D,MAAM,qBAAqB,GAAG,GAAG,WAAW,CAAC,IAAI,IAAI,OAAO,MAAM,CAAA;QAClE,MAAM,qBAAqB,GAAG,GAAG,qBAAqB,GAAG,qBAAqB,EAAE,CAAA;QAEhF,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;QACtC,8DAA8D;QAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,gBAAO,CAAC,GAAG,CACT,yCAAyC,OAAO,CAAC,cAAc,EAAE,CAClE,CAAA;YACD,MAAM,IAAA,0BAAmB,EAAC,qBAAqB,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;QAC1E,CAAC;aAAM,CAAC;YACN,+CAA+C;YAC/C,MAAM,IAAA,uBAAgB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,OAAO,CAAC,aAAa,EACrB,aAAa,CACd,CAAA;QACH,CAAC;QAED,gBAAO,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;;;;;;;;;CACtD"}
|
|
@@ -22,14 +22,18 @@
|
|
|
22
22
|
"description": "Whether to use the public ECR registry",
|
|
23
23
|
"default": false
|
|
24
24
|
},
|
|
25
|
-
"
|
|
25
|
+
"helmChartFolder": {
|
|
26
26
|
"type": "string",
|
|
27
|
-
"description": "The
|
|
28
|
-
"default": "
|
|
27
|
+
"description": "The folder containing the Helm chart files (Chart.yaml, values.yaml, etc.)",
|
|
28
|
+
"default": ".deploy"
|
|
29
29
|
},
|
|
30
|
-
"
|
|
31
|
-
"type": "
|
|
32
|
-
"
|
|
30
|
+
"extraReleaseTags": {
|
|
31
|
+
"type": "array",
|
|
32
|
+
"items": {
|
|
33
|
+
"type": "string"
|
|
34
|
+
},
|
|
35
|
+
"description": "Additional tags to add to the Docker image during a release",
|
|
36
|
+
"default": []
|
|
33
37
|
}
|
|
34
38
|
},
|
|
35
39
|
"required": []
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const release_1 = require("nx/release");
|
|
4
|
-
const circleci_1 = require("../../utils/
|
|
5
|
-
const github_1 = require("../../utils/
|
|
6
|
-
const logger_1 = require("../../utils/
|
|
7
|
-
const tsh_1 = require("../../utils/
|
|
4
|
+
const circleci_1 = require("../../utils/circleci");
|
|
5
|
+
const github_1 = require("../../utils/github");
|
|
6
|
+
const logger_1 = require("../../utils/logger");
|
|
7
|
+
const tsh_1 = require("../../utils/tsh");
|
|
8
8
|
const runExecutor = async (options, context) => {
|
|
9
9
|
if ((0, circleci_1.isCircleCIRunner)()) {
|
|
10
10
|
logger_1.consola.start('CircleCI runner detected, setting it up!');
|
|
@@ -24,9 +24,11 @@ const runExecutor = async (options, context) => {
|
|
|
24
24
|
const { projectsVersionData } = await (0, release_1.releaseVersion)({
|
|
25
25
|
dryRun: options.dryRun,
|
|
26
26
|
verbose: options.verbose,
|
|
27
|
+
groups: options.groups && options.groups.length > 0 ? options.groups : undefined,
|
|
28
|
+
specifier: options.specifier,
|
|
27
29
|
preid: isPreRelease
|
|
28
30
|
? `ephemeral-${branchName.substring(0, 100)}-${commit}`
|
|
29
|
-
:
|
|
31
|
+
: undefined,
|
|
30
32
|
});
|
|
31
33
|
logger_1.consola.success('New versions calculated successfully!');
|
|
32
34
|
// iterate over `projectsVersionData` to extract changed projects
|
|
@@ -53,6 +55,7 @@ const runExecutor = async (options, context) => {
|
|
|
53
55
|
verbose: options.verbose,
|
|
54
56
|
projects: projectsToPublish,
|
|
55
57
|
createRelease: isPreRelease ? false : 'github',
|
|
58
|
+
groups: options.groups && options.groups.length > 0 ? options.groups : undefined,
|
|
56
59
|
});
|
|
57
60
|
logger_1.consola.success('Generated & pushed changelogs successfully!');
|
|
58
61
|
if (options.skipPublish) {
|
|
@@ -67,7 +70,8 @@ const runExecutor = async (options, context) => {
|
|
|
67
70
|
projects: projectsToPublish,
|
|
68
71
|
dryRun: options.dryRun,
|
|
69
72
|
verbose: options.verbose,
|
|
70
|
-
tag: isPreRelease ? 'ephemeral' :
|
|
73
|
+
tag: isPreRelease ? 'ephemeral' : undefined,
|
|
74
|
+
groups: options.groups && options.groups.length > 0 ? options.groups : undefined,
|
|
71
75
|
});
|
|
72
76
|
// Log publish results
|
|
73
77
|
let publishError = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/release/executor.ts"],"names":[],"mappings":";;AACA,wCAA6E;AAE7E,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/release/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,17 @@
|
|
|
20
20
|
"verbose": {
|
|
21
21
|
"type": "boolean",
|
|
22
22
|
"description": "Is verbose"
|
|
23
|
+
},
|
|
24
|
+
"groups": {
|
|
25
|
+
"type": "array",
|
|
26
|
+
"items": {
|
|
27
|
+
"type": "string"
|
|
28
|
+
},
|
|
29
|
+
"description": "Release groups to target (optional). If not specified, all configured projects will be released."
|
|
30
|
+
},
|
|
31
|
+
"specifier": {
|
|
32
|
+
"type": "string",
|
|
33
|
+
"description": "Exact version or semver keyword to apply (e.g., 'patch', 'minor', 'major', '1.2.3')"
|
|
23
34
|
}
|
|
24
35
|
},
|
|
25
36
|
"required": []
|
|
@@ -117,15 +117,6 @@ jobs:
|
|
|
117
117
|
tar -xzf teleport-v17.4.6-linux-amd64-bin.tar.gz
|
|
118
118
|
cd teleport
|
|
119
119
|
sudo ./install
|
|
120
|
-
- run:
|
|
121
|
-
name: 'Install Oras'
|
|
122
|
-
command: |
|
|
123
|
-
VERSION="1.2.2"
|
|
124
|
-
curl -LO "https://github.com/oras-project/oras/releases/download/v${VERSION}/oras_${VERSION}_linux_amd64.tar.gz"
|
|
125
|
-
mkdir -p oras-install/
|
|
126
|
-
tar -zxf oras_${VERSION}_*.tar.gz -C oras-install/
|
|
127
|
-
sudo mv oras-install/oras /usr/local/bin/
|
|
128
|
-
rm -rf oras_${VERSION}_*.tar.gz oras-install/
|
|
129
120
|
- run:
|
|
130
121
|
name: Release
|
|
131
122
|
command: |
|
|
@@ -213,7 +204,9 @@ workflows:
|
|
|
213
204
|
<% if (queuing_release) { %>
|
|
214
205
|
- publish:
|
|
215
206
|
name: Publish Branch
|
|
216
|
-
filters:
|
|
207
|
+
filters:
|
|
208
|
+
branches:
|
|
209
|
+
ignore: main
|
|
217
210
|
requires:
|
|
218
211
|
- github_authenticate
|
|
219
212
|
- test
|
|
@@ -223,7 +216,9 @@ workflows:
|
|
|
223
216
|
|
|
224
217
|
- publish:
|
|
225
218
|
name: Publish Release
|
|
226
|
-
filters:
|
|
219
|
+
filters:
|
|
220
|
+
branches:
|
|
221
|
+
only: main
|
|
227
222
|
requires:
|
|
228
223
|
- github_authenticate
|
|
229
224
|
- test
|
|
@@ -4,7 +4,7 @@ exports.initGenerator = initGenerator;
|
|
|
4
4
|
const fs = require("fs");
|
|
5
5
|
const path = require("path");
|
|
6
6
|
const devkit_1 = require("@nx/devkit");
|
|
7
|
-
const logger_1 = require("../../utils/
|
|
7
|
+
const logger_1 = require("../../utils/logger");
|
|
8
8
|
function injectNxReleaseConfiguration(tree, packageJsonName) {
|
|
9
9
|
(0, devkit_1.updateJson)(tree, 'nx.json', nxJson => {
|
|
10
10
|
nxJson.release = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/generators/init/init.ts"],"names":[],"mappings":";;AAiKA,sCA0EC;AA3OD,yBAAwB;AACxB,6BAA4B;AAE5B,uCAMmB;AAEnB
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
package/src/index.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import { CreateNodesV2 } from '@nx/devkit';
|
|
1
|
+
import { CreateNodesContextV2, CreateNodesV2 } from '@nx/devkit';
|
|
2
2
|
export interface MyPluginOptions {
|
|
3
3
|
}
|
|
4
4
|
export declare const createNodesV2: CreateNodesV2<MyPluginOptions>;
|
|
5
|
+
export declare function createNodesInternal(configFilePath: string, options: MyPluginOptions, context: CreateNodesContextV2): Promise<{
|
|
6
|
+
projects: {
|
|
7
|
+
[x: string]: any;
|
|
8
|
+
};
|
|
9
|
+
}>;
|
package/src/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createNodesV2 = void 0;
|
|
4
|
+
exports.createNodesInternal = createNodesInternal;
|
|
4
5
|
const fs_1 = require("fs");
|
|
5
6
|
const path_1 = require("path");
|
|
6
7
|
const devkit_1 = require("@nx/devkit");
|
|
@@ -14,9 +15,9 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
14
15
|
const projectConfiguration = (0, devkit_1.readJsonFile)(configFilePath);
|
|
15
16
|
const projectRoot = (0, path_1.dirname)(configFilePath);
|
|
16
17
|
const isDockerProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'Dockerfile'));
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
|
|
18
|
+
// Get the Helm chart folder from metadata, default to .deploy
|
|
19
|
+
const helmChartFolder = projectConfiguration.metadata?.helmChartFolder || '.deploy';
|
|
20
|
+
const isHelmProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, helmChartFolder, 'Chart.yaml'));
|
|
20
21
|
const targets = {};
|
|
21
22
|
const ecrRegistry = isDockerProject
|
|
22
23
|
? projectConfiguration.metadata &&
|
|
@@ -30,15 +31,12 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
30
31
|
? projectConfiguration.metadata &&
|
|
31
32
|
projectConfiguration.metadata['isPublicRegistry'] == true
|
|
32
33
|
: false;
|
|
33
|
-
const
|
|
34
|
-
? projectConfiguration.metadata['lambdaRegistry']
|
|
35
|
-
: undefined;
|
|
36
|
-
const lambdaBucket = isLambdaProject
|
|
34
|
+
const extraReleaseTags = isDockerProject
|
|
37
35
|
? projectConfiguration.metadata &&
|
|
38
|
-
projectConfiguration.metadata['
|
|
36
|
+
projectConfiguration.metadata['extraReleaseTags']
|
|
39
37
|
: undefined;
|
|
40
38
|
let release = null;
|
|
41
|
-
if (isHelmProject || isDockerProject
|
|
39
|
+
if (isHelmProject || isDockerProject) {
|
|
42
40
|
const publisherConfig = (0, devkit_1.readJsonFile)((0, path_1.join)(__dirname, '/executors/publisher/schema.json'));
|
|
43
41
|
targets['nx-release-publish'] = {
|
|
44
42
|
// infer the custom publisher target to handle publishing docker & helm artefacts
|
|
@@ -47,11 +45,11 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
47
45
|
ecrRegistry,
|
|
48
46
|
chartRegistry,
|
|
49
47
|
isPublicRegistry,
|
|
50
|
-
|
|
51
|
-
|
|
48
|
+
helmChartFolder,
|
|
49
|
+
extraReleaseTags,
|
|
52
50
|
},
|
|
53
51
|
metadata: {
|
|
54
|
-
technologies: ['helm', 'docker'
|
|
52
|
+
technologies: ['helm', 'docker'],
|
|
55
53
|
description: publisherConfig.description,
|
|
56
54
|
},
|
|
57
55
|
};
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-core/src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/nx-core/src/index.ts"],"names":[],"mappings":";;;AA0BA,kDA4EC;AAtGD,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;AAEM,KAAK,UAAU,mBAAmB,CACvC,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;IAEnE,8DAA8D;IAC9D,MAAM,eAAe,GACnB,oBAAoB,CAAC,QAAQ,EAAE,eAAe,IAAI,SAAS,CAAA;IAC7D,MAAM,aAAa,GAAG,IAAA,eAAU,EAC9B,IAAA,WAAI,EAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CACjD,CAAA;IAED,MAAM,OAAO,GAAG,EAAE,CAAA;IAElB,MAAM,WAAW,GAAG,eAAe;QACjC,CAAC,CAAC,oBAAoB,CAAC,QAAQ;YAC7B,oBAAoB,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC9C,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;IACb,MAAM,gBAAgB,GAAG,eAAe;QACtC,CAAC,CAAC,oBAAoB,CAAC,QAAQ;YAC7B,oBAAoB,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,IAAI;QAC3D,CAAC,CAAC,KAAK,CAAA;IACT,MAAM,gBAAgB,GAAG,eAAe;QACtC,CAAC,CAAC,oBAAoB,CAAC,QAAQ;YAC7B,oBAAoB,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QACnD,CAAC,CAAC,SAAS,CAAA;IAEb,IAAI,OAAO,GAAG,IAAI,CAAA;IAElB,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,iFAAiF;YACjF,QAAQ,EAAE,2BAA2B;YACrC,OAAO,EAAE;gBACP,WAAW;gBACX,aAAa;gBACb,gBAAgB;gBAChB,eAAe;gBACf,gBAAgB;aACjB;YACD,QAAQ,EAAE;gBACR,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAChC,WAAW,EAAE,eAAe,CAAC,WAAW;aACzC;SACF,CAAA;QACD,IAAI,CAAC,oBAAoB,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;YAC5D,OAAO,GAAG;gBACR,4DAA4D;gBAC5D,OAAO,EAAE;oBACP,cAAc,EAAE,gCAAgC;iBACjD;aACF,CAAA;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE;YACR,CAAC,WAAW,CAAC,EAAE;gBACb,GAAG,oBAAoB;gBACvB,OAAO;gBACP,OAAO;aACR;SACF;KACF,CAAA;AACH,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const release_1 = require("nx/release");
|
|
4
4
|
const semver_1 = require("semver");
|
|
5
|
-
const nx_1 = require("../utils/
|
|
5
|
+
const nx_1 = require("../utils/nx");
|
|
6
6
|
class customVersionAction extends release_1.VersionActions {
|
|
7
7
|
constructor() {
|
|
8
8
|
super(...arguments);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":";;AACA,wCAA2C;AAE3C,mCAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"version-actions.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/scripts/version-actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,6 @@ export declare function getAuthWithOidcProfile(): Promise<string | boolean>;
|
|
|
29
29
|
* Login to ECR using the specified registry or the AWS_ECR_REGISTRY environment variable
|
|
30
30
|
*
|
|
31
31
|
* @param registry
|
|
32
|
-
* @param isPublicRegistry
|
|
33
32
|
* @returns A promise that resolves to the result of the login command
|
|
34
33
|
*/
|
|
35
34
|
export declare function loginToEcr(registry: string, isPublicRegistry?: boolean): Promise<Result>;
|
|
@@ -10,7 +10,7 @@ const fs = require("fs");
|
|
|
10
10
|
const os = require("os");
|
|
11
11
|
const path = require("path");
|
|
12
12
|
const consola_1 = require("consola");
|
|
13
|
-
const docker_1 = require("
|
|
13
|
+
const docker_1 = require("./docker");
|
|
14
14
|
const exec_1 = require("./exec");
|
|
15
15
|
let profileName = 'OIDC-PROFILE';
|
|
16
16
|
/**
|
|
@@ -52,7 +52,7 @@ async function getAuthWithOidcProfile() {
|
|
|
52
52
|
const profileExist = await (0, exec_1.exec)(`aws configure list-profiles`).pipe('grep', [profileName]);
|
|
53
53
|
return profileExist.exitCode == 0 ? profileExist.stdout.trim() : false;
|
|
54
54
|
}
|
|
55
|
-
catch
|
|
55
|
+
catch {
|
|
56
56
|
return false;
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -60,7 +60,6 @@ async function getAuthWithOidcProfile() {
|
|
|
60
60
|
* Login to ECR using the specified registry or the AWS_ECR_REGISTRY environment variable
|
|
61
61
|
*
|
|
62
62
|
* @param registry
|
|
63
|
-
* @param isPublicRegistry
|
|
64
63
|
* @returns A promise that resolves to the result of the login command
|
|
65
64
|
*/
|
|
66
65
|
async function loginToEcr(registry, isPublicRegistry = false) {
|
|
@@ -75,7 +74,8 @@ async function loginToEcr(registry, isPublicRegistry = false) {
|
|
|
75
74
|
}
|
|
76
75
|
consola_1.consola.log(`Logging in to ECR registry: ${registry}`);
|
|
77
76
|
try {
|
|
78
|
-
|
|
77
|
+
await (0, docker_1.getDocker)();
|
|
78
|
+
const result = await (0, exec_1.exec)(ecrCommand, { throwOnError: true }).pipe(`docker`, `login --username AWS --password-stdin ${registry}`.split(' '));
|
|
79
79
|
consola_1.consola.success(`Successfully logged in to ECR registry: ${registry}`);
|
|
80
80
|
return result;
|
|
81
81
|
}
|
|
@@ -96,45 +96,26 @@ async function verifyEcrCredentials(registry) {
|
|
|
96
96
|
consola_1.consola.error('No ECR registry provided for credential verification');
|
|
97
97
|
return false;
|
|
98
98
|
}
|
|
99
|
-
const dockerOrPodman = await (0, docker_1.getDockerOrPodman)();
|
|
100
99
|
try {
|
|
101
100
|
consola_1.consola.log(`Verifying ECR credentials for registry: ${registry}`);
|
|
102
|
-
//
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
consola_1.consola.success(`ECR credentials verified for registry: ${registry}`);
|
|
117
|
-
return true;
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
consola_1.consola.error(`ECR credentials verification failed: No authentication found for ${registry} in the .docker/config.json file`);
|
|
121
|
-
return false;
|
|
122
|
-
}
|
|
101
|
+
// Docker config file path
|
|
102
|
+
const configPath = path.join(os.homedir(), '.docker', 'config.json');
|
|
103
|
+
// Check if the config file exists
|
|
104
|
+
if (!fs.existsSync(configPath)) {
|
|
105
|
+
consola_1.consola.error('Docker config file not found');
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
// Read and parse the config file
|
|
109
|
+
const configContent = fs.readFileSync(configPath, 'utf8');
|
|
110
|
+
const config = JSON.parse(configContent);
|
|
111
|
+
// Check if the registry is in the auths section
|
|
112
|
+
if (config.auths && config.auths[registry]) {
|
|
113
|
+
consola_1.consola.success(`ECR credentials verified for registry: ${registry}`);
|
|
114
|
+
return true;
|
|
123
115
|
}
|
|
124
116
|
else {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
const result = await (0, exec_1.exec)(`podman login --get-login ${registry}`, {
|
|
128
|
-
throwOnError: false,
|
|
129
|
-
});
|
|
130
|
-
if (result.exitCode === 0) {
|
|
131
|
-
consola_1.consola.success(`ECR credentials verified for registry: ${registry}`);
|
|
132
|
-
return true;
|
|
133
|
-
}
|
|
134
|
-
else {
|
|
135
|
-
consola_1.consola.error(`ECR credentials verification failed for registry: ${registry}`);
|
|
136
|
-
return false;
|
|
137
|
-
}
|
|
117
|
+
consola_1.consola.error(`ECR credentials verification failed: No authentication found for ${registry} in the .docker/config.json file`);
|
|
118
|
+
return false;
|
|
138
119
|
}
|
|
139
120
|
}
|
|
140
121
|
catch (error) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/aws-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"circleci.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/circleci.ts"],"names":[],"mappings":";;AAIA,4CAEC;AAED,kDAUC;AAhBD,iCAA6B;AAE7B,SAAgB,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAA;AACxC,CAAC;AAEM,KAAK,UAAU,mBAAmB;IACvC,MAAM,QAAQ,GAAG;;;CAGlB;SACI,IAAI,EAAE;SACN,KAAK,CAAC,IAAI,CAAC,CAAA;IACd,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAClC,MAAM,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACzB,CAAC;AACH,CAAC"}
|
package/src/utils/docker.d.ts
CHANGED
|
@@ -4,26 +4,17 @@ import { Result } from 'tinyexec';
|
|
|
4
4
|
*
|
|
5
5
|
* @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
6
|
*/
|
|
7
|
-
export declare function
|
|
7
|
+
export declare function getDocker(): Promise<void>;
|
|
8
8
|
/**
|
|
9
|
-
* Builds a Docker image using the provided Dockerfile.
|
|
9
|
+
* Builds and pushes a Docker image using the provided Dockerfile.
|
|
10
10
|
*
|
|
11
|
-
* @param imageName
|
|
12
|
-
* @param dockerfilePath
|
|
13
|
-
* @param version
|
|
14
|
-
* @param gitRepoUrl
|
|
15
|
-
* @param commitSha
|
|
16
|
-
* @param registry
|
|
11
|
+
* @param imageName - The name of the image
|
|
12
|
+
* @param dockerfilePath - Path to the Dockerfile
|
|
13
|
+
* @param version - Version tag for the image
|
|
14
|
+
* @param gitRepoUrl - Git repository URL for annotations
|
|
15
|
+
* @param commitSha - Git commit SHA for annotations
|
|
16
|
+
* @param registry - Docker registry URL
|
|
17
|
+
* @param extraTags - Optional additional tags for the image
|
|
17
18
|
* @return {Promise<Result>}
|
|
18
19
|
*/
|
|
19
|
-
export declare function
|
|
20
|
-
/**
|
|
21
|
-
* Push a Docker image to ECR
|
|
22
|
-
*
|
|
23
|
-
* @param repositoryName - The name of the repository
|
|
24
|
-
* @param version - The version of the image
|
|
25
|
-
* @param registry
|
|
26
|
-
* @returns A promise that resolves to the result of the push command
|
|
27
|
-
*/
|
|
28
|
-
export declare function pushImageToEcr(repositoryName: string, version: string, registry: string): Promise<Result>;
|
|
29
|
-
export declare function tagLatestImage(repositoryName: string, version: string, registry: string): Promise<Result>;
|
|
20
|
+
export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags?: string[]): Promise<Result>;
|
package/src/utils/docker.js
CHANGED
|
@@ -1,73 +1,89 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const
|
|
8
|
-
const logger_1 = require("./common/logger");
|
|
3
|
+
exports.getDocker = getDocker;
|
|
4
|
+
exports.buildAndPushDockerImage = buildAndPushDockerImage;
|
|
5
|
+
const exec_1 = require("./exec");
|
|
6
|
+
const logger_1 = require("./logger");
|
|
7
|
+
const BUILDKIT_BUILDER_NAME = 'dockerContainerBuildkit';
|
|
9
8
|
/**
|
|
10
9
|
* Determines the available container management tool by checking for Docker and fallback to Podman if Docker is unavailable.
|
|
11
10
|
*
|
|
12
11
|
* @return {Promise<string>} A promise that resolves to the string 'docker' if Docker is available, or 'podman' if Podman is used as a fallback.
|
|
13
12
|
*/
|
|
14
|
-
async function
|
|
13
|
+
async function getDocker() {
|
|
15
14
|
try {
|
|
16
15
|
await (0, exec_1.exec)('docker --version');
|
|
17
|
-
return 'docker';
|
|
18
16
|
}
|
|
19
|
-
catch
|
|
20
|
-
|
|
21
|
-
|
|
17
|
+
catch {
|
|
18
|
+
logger_1.consola.error('No container management tool found. Please install Docker or Docker binary + Colima.');
|
|
19
|
+
throw new Error('No container management tool found');
|
|
22
20
|
}
|
|
23
21
|
}
|
|
22
|
+
async function setupDockerBuilder() {
|
|
23
|
+
await getDocker();
|
|
24
|
+
// Get list of builders
|
|
25
|
+
/*
|
|
26
|
+
Expected command output is:
|
|
27
|
+
NAME/NODE DRIVER/ENDPOINT STATUS BUILDKIT PLATFORMS
|
|
28
|
+
buildkit* docker-container
|
|
29
|
+
\_ buildkit0 \_ unix:///var/run/docker.sock running v0.22.0 linux/amd64 (+3), ...
|
|
30
|
+
default docker
|
|
31
|
+
\_ default \_ default running v0.23.1 linux/amd64 (+3), ...
|
|
32
|
+
*/
|
|
33
|
+
const buildersResult = await (0, exec_1.exec)(`docker buildx ls`, {
|
|
34
|
+
throwOnError: false,
|
|
35
|
+
});
|
|
36
|
+
const hasBuildkitBuilder = buildersResult.stdout.includes(BUILDKIT_BUILDER_NAME);
|
|
37
|
+
const isBuildkitCurrentBuilder = buildersResult.stdout.includes(`${BUILDKIT_BUILDER_NAME}*`);
|
|
38
|
+
if (!hasBuildkitBuilder) {
|
|
39
|
+
// Create new buildkit builder
|
|
40
|
+
await (0, exec_1.exec)(`docker buildx create \
|
|
41
|
+
--name ${BUILDKIT_BUILDER_NAME} \
|
|
42
|
+
--driver=docker-container \
|
|
43
|
+
--use`, {
|
|
44
|
+
throwOnError: true,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
else if (!isBuildkitCurrentBuilder) {
|
|
48
|
+
// Use existing buildkit builder
|
|
49
|
+
await (0, exec_1.exec)(`docker buildx use ${BUILDKIT_BUILDER_NAME}`, {
|
|
50
|
+
throwOnError: true,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
logger_1.consola.info(`Buildx context is set to ${BUILDKIT_BUILDER_NAME}`);
|
|
54
|
+
}
|
|
24
55
|
/**
|
|
25
|
-
* Builds a Docker image using the provided Dockerfile.
|
|
56
|
+
* Builds and pushes a Docker image using the provided Dockerfile.
|
|
26
57
|
*
|
|
27
|
-
* @param imageName
|
|
28
|
-
* @param dockerfilePath
|
|
29
|
-
* @param version
|
|
30
|
-
* @param gitRepoUrl
|
|
31
|
-
* @param commitSha
|
|
32
|
-
* @param registry
|
|
58
|
+
* @param imageName - The name of the image
|
|
59
|
+
* @param dockerfilePath - Path to the Dockerfile
|
|
60
|
+
* @param version - Version tag for the image
|
|
61
|
+
* @param gitRepoUrl - Git repository URL for annotations
|
|
62
|
+
* @param commitSha - Git commit SHA for annotations
|
|
63
|
+
* @param registry - Docker registry URL
|
|
64
|
+
* @param extraTags - Optional additional tags for the image
|
|
33
65
|
* @return {Promise<Result>}
|
|
34
66
|
*/
|
|
35
|
-
async function
|
|
36
|
-
|
|
37
|
-
|
|
67
|
+
async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = []) {
|
|
68
|
+
await getDocker();
|
|
69
|
+
await setupDockerBuilder();
|
|
70
|
+
// Build all tags including base version and extra tags
|
|
71
|
+
const tagArgs = [`${version}`, ...extraTags]
|
|
72
|
+
.map(tag => `-t ${registry}/${imageName}:${tag}`)
|
|
73
|
+
.join(' ');
|
|
74
|
+
return (0, exec_1.exec)(`docker buildx build ${tagArgs} \
|
|
75
|
+
-f ${dockerfilePath} \
|
|
76
|
+
--secret id=NPM_TOKEN \
|
|
77
|
+
--push \
|
|
78
|
+
--annotation org.opencontainers.image.source=${gitRepoUrl} \
|
|
79
|
+
--annotation org.opencontainers.image.revision=${commitSha} \
|
|
80
|
+
--build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} \
|
|
81
|
+
--build-arg DD_GIT_COMMIT_SHA=${commitSha} \
|
|
82
|
+
.`, {
|
|
38
83
|
throwOnError: true,
|
|
39
84
|
nodeOptions: {
|
|
40
85
|
stdio: 'inherit',
|
|
41
86
|
},
|
|
42
87
|
});
|
|
43
88
|
}
|
|
44
|
-
/**
|
|
45
|
-
* Push a Docker image to ECR
|
|
46
|
-
*
|
|
47
|
-
* @param repositoryName - The name of the repository
|
|
48
|
-
* @param version - The version of the image
|
|
49
|
-
* @param registry
|
|
50
|
-
* @returns A promise that resolves to the result of the push command
|
|
51
|
-
*/
|
|
52
|
-
async function pushImageToEcr(repositoryName, version, registry) {
|
|
53
|
-
const dockerOrPodman = await getDockerOrPodman();
|
|
54
|
-
try {
|
|
55
|
-
return await (0, exec_1.exec)(`${dockerOrPodman} push ${registry}/${repositoryName}:${version}`, { throwOnError: true });
|
|
56
|
-
}
|
|
57
|
-
catch (error) {
|
|
58
|
-
// Check if the error is related to authentication
|
|
59
|
-
const errorMessage = error.toString();
|
|
60
|
-
if (errorMessage.includes('no basic auth credentials')) {
|
|
61
|
-
logger_1.consola.error('Authentication error when pushing to ECR. Your Docker credentials may have expired.');
|
|
62
|
-
logger_1.consola.error('Please ensure you are properly authenticated with ECR before pushing images.');
|
|
63
|
-
throw new Error(`Failed to push image due to authentication error: ${errorMessage}`);
|
|
64
|
-
}
|
|
65
|
-
// Re-throw the original error for other types of errors
|
|
66
|
-
throw error;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
async function tagLatestImage(repositoryName, version, registry) {
|
|
70
|
-
const dockerOrPodman = await getDockerOrPodman();
|
|
71
|
-
return (0, exec_1.exec)(`${dockerOrPodman} tag ${registry}/${repositoryName}:${version} ${registry}/${repositoryName}:latest`);
|
|
72
|
-
}
|
|
73
89
|
//# sourceMappingURL=docker.js.map
|
package/src/utils/docker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AAYA,8BASC;AAyDD,0DAkCC;AA9GD,iCAA6B;AAC7B,qCAAkC;AAElC,MAAM,qBAAqB,GAAG,yBAAyB,CAAA;AAEvD;;;;GAIG;AACI,KAAK,UAAU,SAAS;IAC7B,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,gBAAO,CAAC,KAAK,CACX,sFAAsF,CACvF,CAAA;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IACvD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB;IAC/B,MAAM,SAAS,EAAE,CAAA;IAEjB,uBAAuB;IACvB;;;;;;;MAOE;IACF,MAAM,cAAc,GAAG,MAAM,IAAA,WAAI,EAAC,kBAAkB,EAAE;QACpD,YAAY,EAAE,KAAK;KACpB,CAAC,CAAA;IACF,MAAM,kBAAkB,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,CACvD,qBAAqB,CACtB,CAAA;IACD,MAAM,wBAAwB,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,CAC7D,GAAG,qBAAqB,GAAG,CAC5B,CAAA;IAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,8BAA8B;QAC9B,MAAM,IAAA,WAAI,EACR;iBACW,qBAAqB;;cAExB,EACR;YACE,YAAY,EAAE,IAAI;SACnB,CACF,CAAA;IACH,CAAC;SAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACrC,gCAAgC;QAChC,MAAM,IAAA,WAAI,EAAC,qBAAqB,qBAAqB,EAAE,EAAE;YACvD,YAAY,EAAE,IAAI;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,gBAAO,CAAC,IAAI,CAAC,4BAA4B,qBAAqB,EAAE,CAAC,CAAA;AACnE,CAAC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,uBAAuB,CAC3C,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB,EAChB,YAAsB,EAAE;IAExB,MAAM,SAAS,EAAE,CAAA;IACjB,MAAM,kBAAkB,EAAE,CAAA;IAE1B,uDAAuD;IACvD,MAAM,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,EAAE,GAAG,SAAS,CAAC;SACzC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,QAAQ,IAAI,SAAS,IAAI,GAAG,EAAE,CAAC;SAChD,IAAI,CAAC,GAAG,CAAC,CAAA;IAEZ,OAAO,IAAA,WAAI,EACT,uBAAuB,OAAO;WACvB,cAAc;;;qDAG4B,UAAU;uDACR,SAAS;0CACtB,UAAU;sCACd,SAAS;QACvC,EACJ;QACE,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CACF,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAC7C,uCAA4B;AAE5B,qCAAkC;AAElC,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA;IAE/C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAElD,yCAAyC;IACzC,mDAAmD;IACnD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI;IACjC,kBAAkB;IAClB,MAAM,CAAC,EAAE;QACP,8BAA8B;QAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,kDAAkD;YAClD,qBAAqB;YACrB,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CACb,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,MAAM,EAAE,CAChF,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAO,CAAC,KAAK,CACX,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,QAAQ,MAAM,CAAC,MAAM,EAAE,CACjF,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IACD,sCAAsC;IACtC,KAAK,CAAC,EAAE;QACN,yCAAyC;QACzC,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAA;QACb,CAAC;QAED,8DAA8D;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAC5C,MAAM,EACN,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CACrD,CAAA;IAED,OAAO,cAAwB,CAAA;AACjC,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAKD,wDAGC;AAKD,sEAWC;AArCD,iCAA6B;AAE7B;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,WAAI,EAAC,2BAA2B,CAAC,CAAA;IAC1D,OAAO,UAAU,CAAC,QAAQ,IAAI,CAAC;QAC7B,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,sBAAsB;IAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,WAAI,EAAC,4BAA4B,CAAC,CAAA;IAC1D,OAAO,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAC/D,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B;IACjD,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,oCAAoC,CAAC,CAAA;IACpE,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAC9C,8BAA8B,CAC/B,CAAA;QACD,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC"}
|
package/src/utils/helm.js
CHANGED
|
@@ -11,9 +11,9 @@ exports.pushOciPackagedHelm = pushOciPackagedHelm;
|
|
|
11
11
|
const fs = require("node:fs");
|
|
12
12
|
const process = require("node:process");
|
|
13
13
|
const YAML = require("yaml");
|
|
14
|
-
const aws_auth_1 = require("./
|
|
15
|
-
const exec_1 = require("./
|
|
16
|
-
const logger_1 = require("./
|
|
14
|
+
const aws_auth_1 = require("./aws-auth");
|
|
15
|
+
const exec_1 = require("./exec");
|
|
16
|
+
const logger_1 = require("./logger");
|
|
17
17
|
const tshProxy = 'http://localhost';
|
|
18
18
|
/**
|
|
19
19
|
* Read & parse the Helm chart.yaml file
|
package/src/utils/helm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/helm.ts"],"names":[],"mappings":";;AA8BA,4CAIC;AAOD,0EAaC;AAOD,0EAUC;AAMD,0CA4BC;AAQD,sCAuDC;AAQD,kCAQC;AASD,4CAmBC;AAOD,kDASC;AApOD,8BAA6B;AAC7B,wCAAuC;AAEvC,6BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/helm.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"import-esm.js","sourceRoot":"","sources":["../../../../../packages/nx-core/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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/logger.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAE1B,QAAA,OAAO,GAAG,IAAA,uBAAa,EAAC;IACnC,KAAK,EAAE,IAAI;CACZ,CAAC,CAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/nx.ts"],"names":[],"mappings":";;AASA,sCAiCC;AAED,kDAQC;AAOD,gCAQC;AAnED,8BAA6B;AAE7B,uCAImB;AAGZ,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/tsh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nx/devkit';
|
|
2
|
-
import { PublisherExecutorOptions } from './schema';
|
|
3
|
-
export declare function publishLambda(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string, projectDist: string): Promise<void>;
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.publishLambda = publishLambda;
|
|
4
|
-
const path_1 = require("path");
|
|
5
|
-
const aws_auth_1 = require("../../utils/common/aws-auth");
|
|
6
|
-
const github_1 = require("../../utils/common/github");
|
|
7
|
-
const logger_1 = require("../../utils/common/logger");
|
|
8
|
-
const s3_1 = require("../../utils/common/s3");
|
|
9
|
-
const lambda_1 = require("../../utils/lambda/lambda");
|
|
10
|
-
const oci_1 = require("../../utils/lambda/oci");
|
|
11
|
-
async function publishLambda(options, context, version, projectRoot, projectDist) {
|
|
12
|
-
const gitBranchName = await (0, github_1.getSanitizedCurrentGitBranch)();
|
|
13
|
-
const repoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
|
|
14
|
-
const repoName = repoUrl.split('/').pop() ?? 'unknown-repo';
|
|
15
|
-
const zipName = `${context.projectName}-${version}.zip`;
|
|
16
|
-
const zipFileNameS3 = `${options.lambdaBucket}/${repoName}/${zipName}`;
|
|
17
|
-
if (!gitBranchName)
|
|
18
|
-
throw new Error('Unable to get current Git branch');
|
|
19
|
-
if (!options.lambdaRegistry) {
|
|
20
|
-
logger_1.consola.error('No lambda registry provided, add "lambdaRegistry" to your project.json metadata');
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
await (0, aws_auth_1.checkAwsAuth)();
|
|
24
|
-
logger_1.consola.box(`Publishing the lambda artefact ${zipFileNameS3}`);
|
|
25
|
-
logger_1.consola.info(`Zipping ${zipName} from ${projectDist}`);
|
|
26
|
-
await (0, lambda_1.createZip)(projectDist, zipName);
|
|
27
|
-
const zipPath = (0, path_1.join)(projectDist, zipName);
|
|
28
|
-
logger_1.consola.info(`Uploading ${zipPath} to S3 at ${zipFileNameS3}`);
|
|
29
|
-
await (0, s3_1.pushToS3)(zipPath, zipFileNameS3);
|
|
30
|
-
const packageJsonPath = (0, path_1.join)(projectDist, 'package.json');
|
|
31
|
-
logger_1.consola.info(`Pushing empty image to ECR ${process.env.AWS_ECR_REGISTRY}/${options.lambdaRegistry}:${version}`);
|
|
32
|
-
await (0, oci_1.pushImageToEcr)(options.lambdaRegistry, version, packageJsonPath);
|
|
33
|
-
logger_1.consola.success('Lambda artifact successfully pushed to S3!');
|
|
34
|
-
}
|
|
35
|
-
//# sourceMappingURL=lambda.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AAgBA,sCAyCC;AAxDD,+BAA2B;AAI3B,0DAA0D;AAC1D,sDAGkC;AAClC,sDAAmD;AACnD,8CAAgD;AAChD,sDAAqD;AACrD,gDAAuD;AAGhD,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;IAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,cAAc,CAAA;IAE3D,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,MAAM,CAAA;IACvD,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,YAAY,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAA;IAEtE,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAEvE,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5B,gBAAO,CAAC,KAAK,CACX,iFAAiF,CAClF,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,gBAAO,CAAC,GAAG,CAAC,kCAAkC,aAAa,EAAE,CAAC,CAAA;IAE9D,gBAAO,CAAC,IAAI,CAAC,WAAW,OAAO,SAAS,WAAW,EAAE,CAAC,CAAA;IACtD,MAAM,IAAA,kBAAS,EAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAErC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAC1C,gBAAO,CAAC,IAAI,CAAC,aAAa,OAAO,aAAa,aAAa,EAAE,CAAC,CAAA;IAC9D,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEtC,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACzD,gBAAO,CAAC,IAAI,CACV,8BAA8B,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,EAAE,CAClG,CAAA;IACD,MAAM,IAAA,oBAAc,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,CAAC,CAAA;IAEtE,gBAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAA;AAC/D,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"aws-auth.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/aws-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"circleci.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/circleci.ts"],"names":[],"mappings":";;AAEA,4CAEC;AAED,kDAUC;AAhBD,iCAA6B;AAE7B,SAAgB,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAAA;AACxC,CAAC;AAEM,KAAK,UAAU,mBAAmB;IACvC,MAAM,QAAQ,GAAG;;;CAGlB;SACI,IAAI,EAAE;SACN,KAAK,CAAC,IAAI,CAAC,CAAA;IACd,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAClC,MAAM,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACzB,CAAC;AACH,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAC7C,uCAA4B;AAE5B,qCAAkC;AAElC,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,MAAM,WAAW,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA;IAE/C,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAElD,yCAAyC;IACzC,mDAAmD;IACnD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI;IACjC,kBAAkB;IAClB,MAAM,CAAC,EAAE;QACP,8BAA8B;QAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,kDAAkD;YAClD,qBAAqB;YACrB,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CACb,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,MAAM,EAAE,CAChF,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAO,CAAC,KAAK,CACX,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,QAAQ,MAAM,CAAC,MAAM,EAAE,CACjF,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IACD,sCAAsC;IACtC,KAAK,CAAC,EAAE;QACN,yCAAyC;QACzC,IAAI,OAAO,EAAE,YAAY,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAA;QACb,CAAC;QAED,8DAA8D;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAC5C,MAAM,EACN,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CACrD,CAAA;IAED,OAAO,cAAwB,CAAA;AACjC,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAKD,wDAGC;AAKD,sEAWC;AArCD,iCAA6B;AAE7B;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,WAAI,EAAC,2BAA2B,CAAC,CAAA;IAC1D,OAAO,UAAU,CAAC,QAAQ,IAAI,CAAC;QAC7B,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,sBAAsB;IAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,WAAI,EAAC,4BAA4B,CAAC,CAAA;IAC1D,OAAO,SAAS,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAC/D,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B;IACjD,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAAC,oCAAoC,CAAC,CAAA;IACpE,IAAI,WAAW,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAC9C,8BAA8B,CAC/B,CAAA;QACD,IAAI,eAAe,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,OAAO,WAAW,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAA;QACrF,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"import-esm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/logger.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAE1B,QAAA,OAAO,GAAG,IAAA,uBAAa,EAAC;IACnC,KAAK,EAAE,IAAI;CACZ,CAAC,CAAA"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/nx.ts"],"names":[],"mappings":";;AAQA,sCAiCC;AAED,kDAQC;AAOD,gCAQC;AAlED,8BAA6B;AAE7B,uCAImB;AAEZ,KAAK,UAAU,aAAa,CACjC,OAAgC;IAEhC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;IAErD,MAAM,YAAY,GAAG,UAAU;SAC5B,GAAG,CAAC,MAAM,CAAC,EAAE,CACZ,MAAM,CAAC,OAAO,CACZ,sBAAsB,EACtB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAC9C,CACF;SACA,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,sBAAa,CAAC,CAAC;SAC/D,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;IACpE,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,qBAAqB,YAAY,kCAAkC,CACpE,CAAA;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,SAAgB,mBAAmB,CACjC,OAAwB;IAExB,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC,CAAA;IAC3E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,YAAY,CAAA;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,WAAmB;IAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,WAAW,eAAe,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,EAAE,CAAC,CAAA;IAClE,CAAC;IACD,OAAO,CACL,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,WAAW,eAAe,EAAE,MAAM,CAAC,CAAC;QAChE,EAAE,OAAO,IAAI,IAAI,CACpB,CAAA;AACH,CAAC"}
|
package/src/utils/common/s3.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function pushToS3(source: string, targetS3FileName: string): Promise<void>;
|
package/src/utils/common/s3.js
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pushToS3 = pushToS3;
|
|
4
|
-
const aws_auth_1 = require("./aws-auth");
|
|
5
|
-
const exec_1 = require("./exec");
|
|
6
|
-
async function pushToS3(source, targetS3FileName) {
|
|
7
|
-
if (!source || !targetS3FileName) {
|
|
8
|
-
throw new Error('Missing source or target for s3 cp');
|
|
9
|
-
}
|
|
10
|
-
const bucketName = targetS3FileName.split('/')[0];
|
|
11
|
-
const fileName = targetS3FileName.split('/').slice(1).join('/');
|
|
12
|
-
const profile = (0, aws_auth_1.getProfileName)() === 'default' ? '' : `--profile ${(0, aws_auth_1.getProfileName)()}`;
|
|
13
|
-
await (0, exec_1.exec)(`aws s3 cp ${profile} --sse AES256 ${source} s3://${targetS3FileName}`, { throwOnError: true });
|
|
14
|
-
if (targetS3FileName.includes('ephemeral')) {
|
|
15
|
-
await (0, exec_1.exec)(`aws s3api put-object-tagging ${profile} --bucket ${bucketName} --key ${fileName} --tagging '{"TagSet": [{ "Key": "auto-purge", "Value": "true" }]}'`, { throwOnError: true });
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=s3.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/s3.ts"],"names":[],"mappings":";;AAGA,4BAqBC;AAxBD,yCAA2C;AAC3C,iCAA6B;AAEtB,KAAK,UAAU,QAAQ,CAAC,MAAc,EAAE,gBAAwB;IACrE,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;IACvD,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE/D,MAAM,OAAO,GACX,IAAA,yBAAc,GAAE,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,IAAA,yBAAc,GAAE,EAAE,CAAA;IAEvE,MAAM,IAAA,WAAI,EACR,aAAa,OAAO,iBAAiB,MAAM,SAAS,gBAAgB,EAAE,EACtE,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB,CAAA;IACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAA,WAAI,EACR,gCAAgC,OAAO,aAAa,UAAU,UAAU,QAAQ,qEAAqE,EACrJ,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB,CAAA;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tsh.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/common/tsh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare const createZip: (source: string, zipName: string) => Promise<import("tinyexec").Output>;
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createZip = void 0;
|
|
4
|
-
const exec_1 = require("../common/exec");
|
|
5
|
-
const createZip = async (source, zipName) => {
|
|
6
|
-
const cwd = process.cwd();
|
|
7
|
-
process.chdir(source);
|
|
8
|
-
const cmd = `zip -r ${zipName} .`;
|
|
9
|
-
const zip = await (0, exec_1.exec)(cmd, { throwOnError: true });
|
|
10
|
-
process.chdir(cwd);
|
|
11
|
-
return zip;
|
|
12
|
-
};
|
|
13
|
-
exports.createZip = createZip;
|
|
14
|
-
//# sourceMappingURL=lambda.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/lambda/lambda.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAE9B,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAE,OAAe,EAAE,EAAE;IACjE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IACzB,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IACrB,MAAM,GAAG,GAAG,UAAU,OAAO,IAAI,CAAA;IACjC,MAAM,GAAG,GAAG,MAAM,IAAA,WAAI,EAAC,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAA;IACnD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAClB,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAPY,QAAA,SAAS,aAOrB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare function pushImageToEcr(lambdaEcrRepository: string, tag: string, pathToPackageJson: string): Promise<void>;
|
package/src/utils/lambda/oci.js
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pushImageToEcr = pushImageToEcr;
|
|
4
|
-
const consola_1 = require("consola");
|
|
5
|
-
const exec_1 = require("../common/exec");
|
|
6
|
-
async function pushImageToEcr(lambdaEcrRepository, tag, pathToPackageJson) {
|
|
7
|
-
if (!process.env.AWS_ECR_REGISTRY) {
|
|
8
|
-
throw new Error('AWS_ECR_REGISTRY environment variable is not set');
|
|
9
|
-
}
|
|
10
|
-
const uploadToOci = await (0, exec_1.exec)(`oras push ${process.env.AWS_ECR_REGISTRY}/${lambdaEcrRepository}:${tag} --artifact-type application/vnd.payfit.lambda.manifest ${pathToPackageJson}`, {
|
|
11
|
-
throwOnError: true,
|
|
12
|
-
});
|
|
13
|
-
consola_1.consola.log(uploadToOci.stdout);
|
|
14
|
-
if (uploadToOci.exitCode !== 0) {
|
|
15
|
-
throw new Error(`Failed to push image to ECR: ${uploadToOci.stderr || 'Unknown error'}`);
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=oci.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/utils/lambda/oci.ts"],"names":[],"mappings":";;AAIA,wCAoBC;AAxBD,qCAAiC;AAEjC,yCAAqC;AAE9B,KAAK,UAAU,cAAc,CAClC,mBAA2B,EAC3B,GAAW,EACX,iBAAyB;IAEzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;IACrE,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,IAAA,WAAI,EAC5B,aAAa,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,mBAAmB,IAAI,GAAG,2DAA2D,iBAAiB,EAAE,EACrJ;QACE,YAAY,EAAE,IAAI;KACnB,CACF,CAAA;IACD,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,gCAAgC,WAAW,CAAC,MAAM,IAAI,eAAe,EAAE,CACxE,CAAA;IACH,CAAC;AACH,CAAC"}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|