@payfit/nx-core 5.1.1-ephemeral-handle-lambda-docker.1 → 5.1.1-ephemeral-handle-lambda-docker.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/executors/docker-build/executor.js +1 -1
- package/dist/src/executors/docker-build/executor.js.map +1 -1
- package/dist/src/executors/docker-build/schema.json +0 -5
- package/dist/src/executors/publisher/docker.js +1 -1
- package/dist/src/executors/publisher/docker.js.map +1 -1
- package/dist/src/executors/publisher/executor.js +7 -1
- package/dist/src/executors/publisher/executor.js.map +1 -1
- package/dist/src/executors/publisher/lambda.js +3 -3
- package/dist/src/executors/publisher/lambda.js.map +1 -1
- package/dist/src/executors/publisher/schema.json +0 -5
- package/dist/src/index.d.ts +3 -8
- package/dist/src/index.js +55 -126
- package/dist/src/index.js.map +1 -1
- package/dist/src/utils/common/enums.d.ts +7 -0
- package/dist/src/utils/common/enums.js +12 -0
- package/dist/src/utils/common/enums.js.map +1 -0
- package/dist/src/utils/common/nx.d.ts +3 -1
- package/dist/src/utils/common/nx.js +25 -0
- package/dist/src/utils/common/nx.js.map +1 -1
- package/dist/src/utils/docker.d.ts +1 -2
- package/dist/src/utils/docker.js +5 -8
- package/dist/src/utils/docker.js.map +1 -1
- package/dist/src/utils/lambda/lambda.d.ts +4 -0
- package/dist/src/utils/lambda/lambda.js +6 -1
- package/dist/src/utils/lambda/lambda.js.map +1 -1
- package/package.json +1 -1
|
@@ -32,7 +32,7 @@ const runExecutor = async (options, context) => {
|
|
|
32
32
|
await (0, ecr_1.ensureEcrAuth)(registry.name, options.isPublicRepository);
|
|
33
33
|
// Build ephemeral sha tag (immutable)
|
|
34
34
|
logger_1.consola.box(`Building and pushing ephemeral image to ${registry.url}/${options.ecrRepository}:${tag}`);
|
|
35
|
-
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], context.projectName, options.
|
|
35
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], context.projectName, options.buildArgs);
|
|
36
36
|
return { success: true };
|
|
37
37
|
};
|
|
38
38
|
exports.default = runExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/docker-build/executor.ts"],"names":[],"mappings":";;AAAA,8BAA6B;AAI7B,gDAI+B;AAC/B,sDAGkC;AAClC,sDAAmD;AACnD,+CAA4D;AAG5D,MAAM,WAAW,GAGyB,KAAK,EAC7C,OAAmC,EACnC,OAAwB,EACxB,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,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,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,gBAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,kBAAkB;YAC7B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,IAAA,uBAAiB,GAAE;QACvB,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAA,uBAAiB,GAAE;KAC1E,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,GAAG,GAAG,iBAAiB,SAAS,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,aAAa,aAAa,GAAG,2BAA2B,CAClJ,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAE9D,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,2CAA2C,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC1F,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/docker-build/executor.ts"],"names":[],"mappings":";;AAAA,8BAA6B;AAI7B,gDAI+B;AAC/B,sDAGkC;AAClC,sDAAmD;AACnD,+CAA4D;AAG5D,MAAM,WAAW,GAGyB,KAAK,EAC7C,OAAmC,EACnC,OAAwB,EACxB,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,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,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,gBAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,kBAAkB;YAC7B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,IAAA,uBAAiB,GAAE;QACvB,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAA,uBAAiB,GAAE;KAC1E,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,GAAG,GAAG,iBAAiB,SAAS,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,aAAa,aAAa,GAAG,2BAA2B,CAClJ,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAE9D,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,2CAA2C,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC1F,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,SAAS,CAClB,CAAA;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -19,11 +19,6 @@
|
|
|
19
19
|
"description": "Do not build/push, only print what would happen",
|
|
20
20
|
"default": false
|
|
21
21
|
},
|
|
22
|
-
"disableEcrCaching": {
|
|
23
|
-
"type": "boolean",
|
|
24
|
-
"description": "Disable ECR caching",
|
|
25
|
-
"default": false
|
|
26
|
-
},
|
|
27
22
|
"buildArgs": {
|
|
28
23
|
"type": "string",
|
|
29
24
|
"description": "Build arguments to pass to Docker build",
|
|
@@ -47,7 +47,7 @@ async function publishDocker(options, context, version, projectRoot, isDryRun =
|
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
logger_1.consola.start('Building and pushing docker image from scratch');
|
|
50
|
-
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, version, sanitizedRepoUrl, commitSha, registry.url, extraTags, appName, options.
|
|
50
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, version, sanitizedRepoUrl, commitSha, registry.url, extraTags, appName, options.buildArgs);
|
|
51
51
|
logger_1.consola.success('Docker image built and pushed successfully!');
|
|
52
52
|
}
|
|
53
53
|
if (!version.includes('ephemeral')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAoBA,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const enums_1 = require("../../utils/common/enums");
|
|
3
4
|
const logger_1 = require("../../utils/common/logger");
|
|
4
5
|
const nx_1 = require("../../utils/common/nx");
|
|
5
6
|
const docker_1 = require("./docker");
|
|
@@ -10,6 +11,7 @@ const runExecutor = async (options, context) => {
|
|
|
10
11
|
const isDryRun = process.env.NX_DRY_RUN === 'true' || options.dryRun || false;
|
|
11
12
|
const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
|
|
12
13
|
const projectDist = await (0, nx_1.getDistForApp)(context);
|
|
14
|
+
const projectTypes = (0, nx_1.getProjectArtifactTypes)(projectRoot, context.projectsConfigurations[context.projectName]);
|
|
13
15
|
// Access nxReleaseVersionData (added by nx-core release executor at runtime)
|
|
14
16
|
const versionData = options?.nxReleaseVersionData;
|
|
15
17
|
if (!versionData?.[context.projectName]) {
|
|
@@ -17,7 +19,11 @@ const runExecutor = async (options, context) => {
|
|
|
17
19
|
}
|
|
18
20
|
const { newVersion, currentVersion } = versionData[context.projectName];
|
|
19
21
|
logger_1.consola.start(`Publishing ${context.projectName} from ${currentVersion} to ${newVersion}`);
|
|
20
|
-
|
|
22
|
+
// We do not want to publish docker image if it's a LAMBDA_DOCKER,
|
|
23
|
+
// it is handled directly inside the lambda publish script
|
|
24
|
+
if (!projectTypes.includes(enums_1.ArtifactType.LAMBDA)) {
|
|
25
|
+
await (0, docker_1.publishDocker)(options, context, newVersion, projectRoot, isDryRun);
|
|
26
|
+
}
|
|
21
27
|
await (0, helm_1.publishHelm)(options, context, newVersion, projectRoot, projectDist, isDryRun);
|
|
22
28
|
await (0, lambda_1.publishLambda)(options, context, newVersion, projectRoot, projectDist, isDryRun);
|
|
23
29
|
await (0, frontend_1.publishFrontend)(options, context, newVersion, projectRoot, projectDist, isDryRun);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAIA,sDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAIA,oDAAuD;AACvD,sDAAmD;AACnD,8CAA8E;AAC9E,qCAAwC;AACxC,yCAA4C;AAC5C,iCAAoC;AACpC,qCAAwC;AAGxC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,CAAA;IAC7E,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,OAAO,CAAC,CAAA;IAChD,MAAM,YAAY,GAAG,IAAA,4BAAuB,EAC1C,WAAW,EACX,OAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,WAAW,CAAC,CACpD,CAAA;IAED,6EAA6E;IAC7E,MAAM,WAAW,GAAgB,OAAO,EAAE,oBAAoB,CAAA;IAC9D,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAA;IACH,CAAC;IAED,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACvE,gBAAO,CAAC,KAAK,CACX,cAAc,OAAO,CAAC,WAAW,SAAS,cAAc,OAAO,UAAU,EAAE,CAC5E,CAAA;IAED,kEAAkE;IAClE,0DAA0D;IAC1D,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,oBAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAChD,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAC1E,CAAC;IAED,MAAM,IAAA,kBAAW,EACf,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IACD,MAAM,IAAA,sBAAa,EACjB,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IACD,MAAM,IAAA,0BAAe,EACnB,OAAO,EACP,OAAO,EACP,UAAU,EACV,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -63,7 +63,7 @@ async function publishLambda(options, context, version, projectRoot, projectDist
|
|
|
63
63
|
logger_1.consola.box(`Would have published lambda function version ${version} for project ${context.projectName} but --dry-run is enabled`);
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
if (options.lambdaArtifactType ===
|
|
66
|
+
if (options.lambdaArtifactType === lambda_1.LambdaArtifactType.ZIP) {
|
|
67
67
|
await (0, aws_auth_1.checkAwsAuth)();
|
|
68
68
|
logger_1.consola.box(`Publishing the lambda artefact ${zipFileNameS3}`);
|
|
69
69
|
logger_1.consola.info(`Zipping ${zipName} from ${projectDist}`);
|
|
@@ -77,13 +77,13 @@ async function publishLambda(options, context, version, projectRoot, projectDist
|
|
|
77
77
|
logger_1.consola.box(`Creating new Lambda version and running smoke tests`);
|
|
78
78
|
await (0, publish_1.createLambdaVersion)(options.lambdaStacks, options.lambdaFunctions, version, options.lambdaHealthCheckPayload);
|
|
79
79
|
const packageJsonPath = (0, path_1.join)(projectDist, 'package.json');
|
|
80
|
-
if (options.lambdaArtifactType ===
|
|
80
|
+
if (options.lambdaArtifactType === lambda_1.LambdaArtifactType.ZIP) {
|
|
81
81
|
logger_1.consola.info(`Pushing empty image to ECR ${(0, ecr_1.getAwsEcrRegistry)()}/${options.lambdaOciRepository}:${version}`);
|
|
82
82
|
await (0, aws_auth_1.loginToEcr)((0, ecr_1.getAwsEcrRegistry)());
|
|
83
83
|
await (0, oci_1.pushImageToEcr)(options.lambdaOciRepository, version, packageJsonPath, 'lambda', (0, ecr_1.getAwsEcrRegistry)());
|
|
84
84
|
logger_1.consola.success(`Lambda version ${version} successfully created and smoke tests passed, your lambda is ready to be promoted in Kargo !`);
|
|
85
85
|
}
|
|
86
|
-
else if (options.lambdaArtifactType ===
|
|
86
|
+
else if (options.lambdaArtifactType === lambda_1.LambdaArtifactType.DOCKER) {
|
|
87
87
|
logger_1.consola.info(`Publishing Docker image for Lambda function`);
|
|
88
88
|
await (0, docker_1.publishDocker)(options, context, version, projectRoot, isDryRun);
|
|
89
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AAiCA,sCA0GC;AA3ID,+BAA2B;AAI3B,0DAAsE;AACtE,gDAA0D;AAC1D,sDAGkC;AAClC,sDAAmD;AACnD,gDAAuD;AACvD,8CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/executors/publisher/lambda.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,11 +13,6 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"description": "The docker registry"
|
|
15
15
|
},
|
|
16
|
-
"disableEcrCaching": {
|
|
17
|
-
"type": "boolean",
|
|
18
|
-
"description": "Disable ECR caching",
|
|
19
|
-
"default": false
|
|
20
|
-
},
|
|
21
16
|
"chartOciRegistry": {
|
|
22
17
|
"type": "string",
|
|
23
18
|
"description": "The docker registry in oci format (AWS ECR)"
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,12 +1,7 @@
|
|
|
1
1
|
import { CreateNodesContextV2, CreateNodesV2 } from '@nx/devkit';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
export declare
|
|
5
|
-
DOCKER = "docker",
|
|
6
|
-
ZIP = "zip"
|
|
7
|
-
}
|
|
8
|
-
export declare const createNodesV2: CreateNodesV2<MyPluginOptions>;
|
|
9
|
-
export declare function createNodesInternal(configFilePath: string, options: MyPluginOptions, context: CreateNodesContextV2): Promise<{
|
|
2
|
+
import { PublisherExecutorOptions } from './executors/publisher/schema';
|
|
3
|
+
export declare const createNodesV2: CreateNodesV2<PublisherExecutorOptions>;
|
|
4
|
+
export declare function createNodesInternal(configFilePath: string, options: PublisherExecutorOptions, _context: CreateNodesContextV2): Promise<{
|
|
10
5
|
projects: {
|
|
11
6
|
[x: string]: {
|
|
12
7
|
targets: {};
|
package/dist/src/index.js
CHANGED
|
@@ -1,128 +1,78 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pushImageToEcr = exports.loginToEcr = exports.createNodesV2 =
|
|
3
|
+
exports.pushImageToEcr = exports.loginToEcr = exports.createNodesV2 = void 0;
|
|
4
4
|
exports.createNodesInternal = createNodesInternal;
|
|
5
|
-
const fs_1 = require("fs");
|
|
6
5
|
const path_1 = require("path");
|
|
7
6
|
const devkit_1 = require("@nx/devkit");
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
LambdaArtifactType["ZIP"] = "zip";
|
|
12
|
-
})(LambdaArtifactType || (exports.LambdaArtifactType = LambdaArtifactType = {}));
|
|
7
|
+
const enums_1 = require("./utils/common/enums");
|
|
8
|
+
const nx_1 = require("./utils/common/nx");
|
|
9
|
+
const lambda_1 = require("./utils/lambda/lambda");
|
|
13
10
|
exports.createNodesV2 = [
|
|
14
11
|
'**/project.json',
|
|
15
12
|
async (configFiles, options, context) => {
|
|
16
13
|
return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => createNodesInternal(configFile, options, context), configFiles, options, context);
|
|
17
14
|
},
|
|
18
15
|
];
|
|
19
|
-
async function createNodesInternal(configFilePath, options,
|
|
16
|
+
async function createNodesInternal(configFilePath, options, _context) {
|
|
20
17
|
const projectConfiguration = (0, devkit_1.readJsonFile)(configFilePath);
|
|
21
18
|
const projectRoot = (0, path_1.dirname)(configFilePath);
|
|
22
|
-
const
|
|
23
|
-
projectConfiguration.metadata &&
|
|
24
|
-
projectConfiguration.metadata['ecrRepository'];
|
|
25
|
-
// Get the Helm chart folder from metadata, default to .deploy
|
|
26
|
-
const helmChartFolder = projectConfiguration?.metadata?.['helmChartFolder'] || '.deploy';
|
|
27
|
-
const isHelmProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, helmChartFolder, 'Chart.yaml'));
|
|
28
|
-
const isLambdaProject = !!(projectConfiguration.metadata &&
|
|
29
|
-
projectConfiguration.metadata['lambdaFunctions']);
|
|
30
|
-
const isFrontendProject = !!(projectConfiguration.metadata &&
|
|
31
|
-
projectConfiguration.metadata['frontendArtifactsBucketName']);
|
|
32
|
-
const isTfModuleProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, '.spacelift/config.yml')) &&
|
|
33
|
-
(0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'main.tf'));
|
|
19
|
+
const projectTypes = (0, nx_1.getProjectArtifactTypes)(projectRoot, projectConfiguration);
|
|
34
20
|
const targets = {};
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const lambdaOciRepository = isLambdaProject
|
|
75
|
-
? projectConfiguration.metadata &&
|
|
76
|
-
projectConfiguration.metadata['lambdaOciRepository']
|
|
77
|
-
? projectConfiguration.metadata['lambdaOciRepository']
|
|
78
|
-
: projectConfiguration.metadata['lambdaFunctions'][0]
|
|
79
|
-
: undefined;
|
|
80
|
-
const lambdaArtifactType = isLambdaProject && isDockerProject
|
|
81
|
-
? LambdaArtifactType.DOCKER
|
|
82
|
-
: LambdaArtifactType.ZIP;
|
|
83
|
-
const frontendArtifactsBucketName = isFrontendProject
|
|
84
|
-
? projectConfiguration.metadata &&
|
|
85
|
-
projectConfiguration.metadata['frontendArtifactsBucketName']
|
|
86
|
-
: undefined;
|
|
87
|
-
const frontendFilesWithoutCache = isFrontendProject
|
|
88
|
-
? projectConfiguration.metadata &&
|
|
89
|
-
projectConfiguration.metadata['frontendFilesWithoutCache']
|
|
90
|
-
: undefined;
|
|
91
|
-
const frontendFoldersWithoutCache = isFrontendProject
|
|
92
|
-
? projectConfiguration.metadata &&
|
|
93
|
-
projectConfiguration.metadata['frontendFoldersWithoutCache']
|
|
94
|
-
: undefined;
|
|
95
|
-
const frontendOciRepository = isFrontendProject
|
|
96
|
-
? projectConfiguration.metadata &&
|
|
97
|
-
projectConfiguration.metadata['frontendOciRepository']
|
|
98
|
-
: undefined;
|
|
99
|
-
const tflintConfigFile = isTfModuleProject
|
|
100
|
-
? projectConfiguration.metadata &&
|
|
101
|
-
projectConfiguration.metadata['tflintConfigFile']
|
|
102
|
-
? projectConfiguration.metadata['tflintConfigFile']
|
|
103
|
-
: (0, path_1.join)((0, devkit_1.offsetFromRoot)(projectRoot), '.tflint.hcl')
|
|
104
|
-
: undefined;
|
|
21
|
+
// Ensure options is defined to avoid undefined errors
|
|
22
|
+
if (!options) {
|
|
23
|
+
options = {};
|
|
24
|
+
}
|
|
25
|
+
// Spread metadata directly into options
|
|
26
|
+
options = {
|
|
27
|
+
...options,
|
|
28
|
+
...(projectConfiguration.metadata || {}),
|
|
29
|
+
};
|
|
30
|
+
// Derive project capability flags from enum
|
|
31
|
+
const isDockerProject = projectTypes.includes(enums_1.ArtifactType.DOCKER);
|
|
32
|
+
const isLambdaProject = projectTypes.includes(enums_1.ArtifactType.LAMBDA);
|
|
33
|
+
const isFrontendProject = projectTypes.includes(enums_1.ArtifactType.FRONTEND);
|
|
34
|
+
const isTfModuleProject = projectTypes.includes(enums_1.ArtifactType.TERRAFORM_MODULE);
|
|
35
|
+
const isHelmProject = projectTypes.includes(enums_1.ArtifactType.HELM);
|
|
36
|
+
// Handle computed values that need special logic
|
|
37
|
+
if (isHelmProject) {
|
|
38
|
+
// Resolve Helm chart folder with fallback
|
|
39
|
+
options.helmChartFolder =
|
|
40
|
+
(typeof options.helmChartFolder === 'string' &&
|
|
41
|
+
options.helmChartFolder.trim()) ||
|
|
42
|
+
'.deploy';
|
|
43
|
+
}
|
|
44
|
+
if (isDockerProject) {
|
|
45
|
+
options.isPublicRegistry = options.isPublicRegistry === true;
|
|
46
|
+
}
|
|
47
|
+
if (isLambdaProject) {
|
|
48
|
+
options.lambdaArtifactType = projectTypes.includes(enums_1.ArtifactType.DOCKER)
|
|
49
|
+
? lambda_1.LambdaArtifactType.DOCKER
|
|
50
|
+
: lambda_1.LambdaArtifactType.ZIP;
|
|
51
|
+
// Fallback for lambdaOciRepository
|
|
52
|
+
if (!options.lambdaOciRepository && options.lambdaFunctions?.[0]) {
|
|
53
|
+
options.lambdaOciRepository = options.lambdaFunctions[0];
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
// Computed: tflintConfigFile with fallback
|
|
57
|
+
if (isTfModuleProject && !options.tflintConfigFile) {
|
|
58
|
+
options.tflintConfigFile = (0, path_1.join)((0, devkit_1.offsetFromRoot)(projectRoot), '.tflint.hcl');
|
|
59
|
+
}
|
|
105
60
|
const isRootProject = projectRoot === '.';
|
|
106
61
|
let release = null;
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
isFrontendProject) {
|
|
62
|
+
// Create targets for projects with deployable artifacts (Docker/Lambda/Frontend/Helm)
|
|
63
|
+
if (projectTypes.length > 0 &&
|
|
64
|
+
!projectTypes.includes(enums_1.ArtifactType.TERRAFORM_MODULE)) {
|
|
111
65
|
const publisherConfig = (0, devkit_1.readJsonFile)((0, path_1.join)(__dirname, '/executors/publisher/schema.json'));
|
|
112
66
|
if (isDockerProject) {
|
|
113
67
|
const dockerBuildConfig = (0, devkit_1.readJsonFile)((0, path_1.join)(__dirname, '/executors/docker-build/schema.json'));
|
|
114
|
-
targets[isPublicRegistry ? 'docker-build-public' : 'docker-build'] = {
|
|
68
|
+
targets[options.isPublicRegistry ? 'docker-build-public' : 'docker-build'] = {
|
|
115
69
|
executor: '@payfit/nx-core:docker-build',
|
|
116
70
|
cache: false,
|
|
117
71
|
// Inputs kept explicit to ensure correct affected graph and hashing,
|
|
118
72
|
// while still avoiding remote cache replay of side-effects.
|
|
119
73
|
inputs: ['production', '^production'],
|
|
120
74
|
outputs: [],
|
|
121
|
-
options
|
|
122
|
-
ecrRepository: ecrRepository,
|
|
123
|
-
isPublicRepository: isPublicRegistry,
|
|
124
|
-
disableEcrCaching,
|
|
125
|
-
},
|
|
75
|
+
options,
|
|
126
76
|
metadata: {
|
|
127
77
|
technologies: ['docker'],
|
|
128
78
|
description: dockerBuildConfig?.description,
|
|
@@ -133,25 +83,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
133
83
|
// infer the custom publisher target to handle publishing docker & helm artefacts
|
|
134
84
|
executor: '@payfit/nx-core:publisher',
|
|
135
85
|
cache: false,
|
|
136
|
-
options
|
|
137
|
-
ecrRepository,
|
|
138
|
-
disableEcrCaching,
|
|
139
|
-
chartRegistry,
|
|
140
|
-
chartOciRegistry,
|
|
141
|
-
isPublicRegistry,
|
|
142
|
-
helmChartFolder,
|
|
143
|
-
extraReleaseTags,
|
|
144
|
-
lambdaBucket,
|
|
145
|
-
lambdaStacks,
|
|
146
|
-
lambdaFunctions,
|
|
147
|
-
lambdaHealthCheckPayload,
|
|
148
|
-
lambdaOciRepository,
|
|
149
|
-
lambdaArtifactType,
|
|
150
|
-
frontendArtifactsBucketName,
|
|
151
|
-
frontendFilesWithoutCache,
|
|
152
|
-
frontendFoldersWithoutCache,
|
|
153
|
-
frontendOciRepository,
|
|
154
|
-
},
|
|
86
|
+
options,
|
|
155
87
|
metadata: {
|
|
156
88
|
technologies: ['helm', 'docker', 'lambda', 'frontend'],
|
|
157
89
|
description: publisherConfig.description,
|
|
@@ -185,11 +117,8 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
185
117
|
},
|
|
186
118
|
};
|
|
187
119
|
}
|
|
188
|
-
if (
|
|
189
|
-
|
|
190
|
-
!isHelmProject &&
|
|
191
|
-
!isLambdaProject &&
|
|
192
|
-
!isFrontendProject) {
|
|
120
|
+
if (projectTypes.length == 1 &&
|
|
121
|
+
projectTypes[0] == enums_1.ArtifactType.TERRAFORM_MODULE) {
|
|
193
122
|
targets['tofu-format'] = {
|
|
194
123
|
executor: 'nx:run-commands',
|
|
195
124
|
cache: false,
|
|
@@ -229,7 +158,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
229
158
|
parallel: false,
|
|
230
159
|
},
|
|
231
160
|
env: {
|
|
232
|
-
TFLINT_CONFIG_FILE: tflintConfigFile,
|
|
161
|
+
TFLINT_CONFIG_FILE: options.tflintConfigFile,
|
|
233
162
|
},
|
|
234
163
|
metadata: {
|
|
235
164
|
technologies: ['tofu'],
|
|
@@ -241,7 +170,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
241
170
|
cache: false,
|
|
242
171
|
metadata: {
|
|
243
172
|
technologies: ['tofu'],
|
|
244
|
-
description: 'No release publish',
|
|
173
|
+
description: 'No release publish, Spacelift handles it from the Git tag',
|
|
245
174
|
},
|
|
246
175
|
};
|
|
247
176
|
if (!projectConfiguration?.release?.version
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ArtifactType = void 0;
|
|
4
|
+
var ArtifactType;
|
|
5
|
+
(function (ArtifactType) {
|
|
6
|
+
ArtifactType["DOCKER"] = "docker";
|
|
7
|
+
ArtifactType["LAMBDA"] = "lambda";
|
|
8
|
+
ArtifactType["FRONTEND"] = "frontend";
|
|
9
|
+
ArtifactType["TERRAFORM_MODULE"] = "Terraform module";
|
|
10
|
+
ArtifactType["HELM"] = "helm chart";
|
|
11
|
+
})(ArtifactType || (exports.ArtifactType = ArtifactType = {}));
|
|
12
|
+
//# sourceMappingURL=enums.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../src/utils/common/enums.ts"],"names":[],"mappings":";;;AAAA,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,qDAAqC,CAAA;IACrC,mCAAmB,CAAA;AACrB,CAAC,EANW,YAAY,4BAAZ,YAAY,QAMvB"}
|
|
@@ -1,2 +1,4 @@
|
|
|
1
|
-
import { ExecutorContext } from '@nx/devkit';
|
|
1
|
+
import { ExecutorContext, ProjectConfiguration } from '@nx/devkit';
|
|
2
|
+
import { ArtifactType } from './enums';
|
|
2
3
|
export declare function getDistForApp(context: ExecutorContext): Promise<string>;
|
|
4
|
+
export declare function getProjectArtifactTypes(projectRoot: string, projectConfiguration: ProjectConfiguration): ArtifactType[] | undefined;
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDistForApp = getDistForApp;
|
|
4
|
+
exports.getProjectArtifactTypes = getProjectArtifactTypes;
|
|
5
|
+
const fs_1 = require("fs");
|
|
4
6
|
const fs = require("node:fs");
|
|
5
7
|
const path_1 = require("path");
|
|
6
8
|
const devkit_1 = require("@nx/devkit");
|
|
7
9
|
const utils_1 = require("nx/src/tasks-runner/utils");
|
|
10
|
+
const enums_1 = require("./enums");
|
|
8
11
|
async function getDistForApp(context) {
|
|
9
12
|
const target = (0, devkit_1.parseTargetString)('build', context);
|
|
10
13
|
const project = context.projectGraph.nodes[target.project].data;
|
|
@@ -38,4 +41,26 @@ function normalizeOutputPath(outputPath) {
|
|
|
38
41
|
}
|
|
39
42
|
return outputPath;
|
|
40
43
|
}
|
|
44
|
+
function getProjectArtifactTypes(projectRoot, projectConfiguration) {
|
|
45
|
+
const isDockerProject = fs.existsSync((0, path_1.join)(projectRoot, 'Dockerfile')) &&
|
|
46
|
+
!!projectConfiguration?.metadata?.['ecrRepository'];
|
|
47
|
+
const isLambdaProject = !!projectConfiguration?.metadata?.lambdaFunctions &&
|
|
48
|
+
projectConfiguration?.metadata?.lambdaFunctions.length > 0;
|
|
49
|
+
const isFrontendProject = !!projectConfiguration?.metadata?.frontendArtifactsBucketName;
|
|
50
|
+
const isTfModuleProject = fs.existsSync((0, path_1.join)(projectRoot, '.spacelift/config.yml')) &&
|
|
51
|
+
fs.existsSync((0, path_1.join)(projectRoot, 'main.tf'));
|
|
52
|
+
const isHelmProject = (0, fs_1.existsSync)((0, path_1.join)(projectRoot, projectConfiguration?.metadata?.helmChartFolder || '.deploy', 'Chart.yaml'));
|
|
53
|
+
const artifactTypes = [];
|
|
54
|
+
if (isLambdaProject)
|
|
55
|
+
artifactTypes.push(enums_1.ArtifactType.LAMBDA);
|
|
56
|
+
if (isDockerProject)
|
|
57
|
+
artifactTypes.push(enums_1.ArtifactType.DOCKER);
|
|
58
|
+
if (isFrontendProject)
|
|
59
|
+
artifactTypes.push(enums_1.ArtifactType.FRONTEND);
|
|
60
|
+
if (isTfModuleProject)
|
|
61
|
+
artifactTypes.push(enums_1.ArtifactType.TERRAFORM_MODULE);
|
|
62
|
+
if (isHelmProject)
|
|
63
|
+
artifactTypes.push(enums_1.ArtifactType.HELM);
|
|
64
|
+
return artifactTypes.length > 0 ? artifactTypes : [];
|
|
65
|
+
}
|
|
41
66
|
//# sourceMappingURL=nx.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../src/utils/common/nx.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../src/utils/common/nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,7 @@ import { Result } from 'tinyexec';
|
|
|
10
10
|
* @param registry - Docker registry URL
|
|
11
11
|
* @param extraTags - Optional additional tags for the image
|
|
12
12
|
* @param appName
|
|
13
|
-
* @param disableEcrCache
|
|
14
13
|
* @param buildArgs - Optional build arguments for the Docker build
|
|
15
14
|
* @return {Promise<Result>}
|
|
16
15
|
*/
|
|
17
|
-
export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string,
|
|
16
|
+
export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string, buildArgs?: string): Promise<Result>;
|
package/dist/src/utils/docker.js
CHANGED
|
@@ -44,11 +44,10 @@ async function setupDockerBuilder(appName) {
|
|
|
44
44
|
* @param registry - Docker registry URL
|
|
45
45
|
* @param extraTags - Optional additional tags for the image
|
|
46
46
|
* @param appName
|
|
47
|
-
* @param disableEcrCache
|
|
48
47
|
* @param buildArgs - Optional build arguments for the Docker build
|
|
49
48
|
* @return {Promise<Result>}
|
|
50
49
|
*/
|
|
51
|
-
async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName,
|
|
50
|
+
async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName, buildArgs = undefined) {
|
|
52
51
|
appName = appName.replaceAll('@', '-').replaceAll('/', '-');
|
|
53
52
|
const buildContextName = await setupDockerBuilder(appName);
|
|
54
53
|
// Build all tags including base version and extra tags
|
|
@@ -62,13 +61,11 @@ async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRe
|
|
|
62
61
|
const branch = await (0, github_1.getSanitizedCurrentGitBranch)();
|
|
63
62
|
const branchCacheRef = `${registry}/${imageName}:cache-build-${branch}`;
|
|
64
63
|
const mainCacheRef = `${registry}/${imageName}:cache-build-main`;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
cacheArgParts.push(`--cache-from type=registry,ref=${mainCacheRef}`);
|
|
69
|
-
}
|
|
70
|
-
cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
|
|
64
|
+
cacheArgParts.push(`--cache-from type=registry,ref=${branchCacheRef}`);
|
|
65
|
+
if (!(await (0, github_1.isDefaultBranch)(branch))) {
|
|
66
|
+
cacheArgParts.push(`--cache-from type=registry,ref=${mainCacheRef}`);
|
|
71
67
|
}
|
|
68
|
+
cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
|
|
72
69
|
}
|
|
73
70
|
const buildArgsParts = [];
|
|
74
71
|
if (buildArgs) {
|
|
@@ -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":"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"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createZip = void 0;
|
|
3
|
+
exports.createZip = exports.LambdaArtifactType = void 0;
|
|
4
4
|
const exec_1 = require("../common/exec");
|
|
5
|
+
var LambdaArtifactType;
|
|
6
|
+
(function (LambdaArtifactType) {
|
|
7
|
+
LambdaArtifactType["DOCKER"] = "docker";
|
|
8
|
+
LambdaArtifactType["ZIP"] = "zip";
|
|
9
|
+
})(LambdaArtifactType || (exports.LambdaArtifactType = LambdaArtifactType = {}));
|
|
5
10
|
/**
|
|
6
11
|
* Creates a ZIP archive of Lambda function code.
|
|
7
12
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/utils/lambda/lambda.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC;;;;;GAKG;AACI,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
|
+
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/utils/lambda/lambda.ts"],"names":[],"mappings":";;;AAAA,yCAAqC;AAErC,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,iCAAW,CAAA;AACb,CAAC,EAHW,kBAAkB,kCAAlB,kBAAkB,QAG7B;AAED;;;;;GAKG;AACI,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"}
|