@payfit/nx-core 5.20.6 → 5.20.7-ephemeral-ts-strict.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/executors/docker-build/executor.js +10 -2
- package/dist/src/executors/docker-build/executor.js.map +1 -1
- package/dist/src/executors/preview-deploy/kargoPolicy.js +23 -10
- package/dist/src/executors/preview-deploy/kargoPolicy.js.map +1 -1
- package/dist/src/executors/publisher/docker.js +13 -10
- package/dist/src/executors/publisher/docker.js.map +1 -1
- package/dist/src/executors/publisher/executor.js +15 -8
- package/dist/src/executors/publisher/executor.js.map +1 -1
- package/dist/src/executors/publisher/frontend.js +6 -0
- package/dist/src/executors/publisher/frontend.js.map +1 -1
- package/dist/src/executors/publisher/helm.js +3 -0
- package/dist/src/executors/publisher/helm.js.map +1 -1
- package/dist/src/executors/publisher/lambda.js +22 -7
- package/dist/src/executors/publisher/lambda.js.map +1 -1
- package/dist/src/generators/init/init.js +17 -5
- package/dist/src/generators/init/init.js.map +1 -1
- package/dist/src/generators/local-lambda-setup/local-lambda-setup.d.ts +7 -7
- package/dist/src/generators/local-lambda-setup/local-lambda-setup.js +22 -9
- package/dist/src/generators/local-lambda-setup/local-lambda-setup.js.map +1 -1
- package/dist/src/generators/sync/sync-list-lambda-functions.js +10 -2
- package/dist/src/generators/sync/sync-list-lambda-functions.js.map +1 -1
- package/dist/src/index.d.ts +9 -3
- package/dist/src/index.js +19 -15
- package/dist/src/index.js.map +1 -1
- package/dist/src/migrations/20251205-metadata-lambda-function-to-object.js +9 -8
- package/dist/src/migrations/20251205-metadata-lambda-function-to-object.js.map +1 -1
- package/dist/src/migrations/5.13.2/20251226-switch-renovate-config.js +4 -0
- package/dist/src/migrations/5.13.2/20251226-switch-renovate-config.js.map +1 -1
- package/dist/src/scripts/version-actions.js +12 -2
- package/dist/src/scripts/version-actions.js.map +1 -1
- package/dist/src/utils/common/nx.js +20 -6
- package/dist/src/utils/common/nx.js.map +1 -1
- package/dist/src/utils/common/renovate.js +4 -0
- package/dist/src/utils/common/renovate.js.map +1 -1
- package/dist/src/utils/datadog.js +10 -5
- package/dist/src/utils/datadog.js.map +1 -1
- package/dist/src/utils/docker.d.ts +1 -1
- package/dist/src/utils/docker.js +1 -1
- package/dist/src/utils/docker.js.map +1 -1
- package/dist/src/utils/lambda/aws-lambda.d.ts +2 -2
- package/dist/src/utils/lambda/aws-lambda.js +21 -9
- package/dist/src/utils/lambda/aws-lambda.js.map +1 -1
- package/dist/src/utils/lambda/spacelift.js +1 -1
- package/dist/src/utils/lambda/spacelift.js.map +1 -1
- package/dist/src/utils/spacelift/lib/graphql.service.d.ts +1 -1
- package/dist/src/utils/spacelift/lib/graphql.service.js +5 -3
- package/dist/src/utils/spacelift/lib/graphql.service.js.map +1 -1
- package/dist/src/utils/spacelift/lib/spacelift.error.d.ts +8 -8
- package/dist/src/utils/spacelift/lib/spacelift.error.js +14 -6
- package/dist/src/utils/spacelift/lib/spacelift.error.js.map +1 -1
- package/package.json +1 -1
- package/dist/src/utils/spacelift/lib/__generated__/gql.d.ts +0 -15
- package/dist/src/utils/spacelift/lib/__generated__/gql.js +0 -8
- package/dist/src/utils/spacelift/lib/__generated__/gql.js.map +0 -1
- package/dist/src/utils/spacelift/lib/__generated__/index.d.ts +0 -2
- package/dist/src/utils/spacelift/lib/__generated__/index.js +0 -6
- package/dist/src/utils/spacelift/lib/__generated__/index.js.map +0 -1
|
@@ -6,7 +6,15 @@ const github_1 = require("../../utils/common/github");
|
|
|
6
6
|
const logger_1 = require("../../utils/common/logger");
|
|
7
7
|
const docker_1 = require("../../utils/docker");
|
|
8
8
|
const runExecutor = async (options, context) => {
|
|
9
|
-
const
|
|
9
|
+
const projectName = context.projectName;
|
|
10
|
+
if (!projectName) {
|
|
11
|
+
throw new Error('Missing project name in executor context');
|
|
12
|
+
}
|
|
13
|
+
const projectNode = context.projectGraph?.nodes?.[projectName];
|
|
14
|
+
if (!projectNode) {
|
|
15
|
+
throw new Error(`Project ${projectName} not found in project graph`);
|
|
16
|
+
}
|
|
17
|
+
const projectRoot = projectNode.data.root;
|
|
10
18
|
const projectDockerfile = `${projectRoot}/Dockerfile`;
|
|
11
19
|
const isCI = process.env.CI === 'true';
|
|
12
20
|
if (!fs.existsSync(projectDockerfile)) {
|
|
@@ -35,7 +43,7 @@ const runExecutor = async (options, context) => {
|
|
|
35
43
|
}
|
|
36
44
|
// Build ephemeral sha tag (immutable)
|
|
37
45
|
logger_1.consola.box(`${isCI ? 'Building and pushing ephemeral' : 'Building locally'} image to ${isCI ? registry.url + '/' : ''}${options.ecrRepository}:${tag}`);
|
|
38
|
-
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [],
|
|
46
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], projectName, options.buildArgs, isCI);
|
|
39
47
|
return { success: true };
|
|
40
48
|
};
|
|
41
49
|
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,
|
|
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,WAAW,CAAA;IACvC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;IAC7D,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC,WAAW,CAAC,CAAA;IAC9D,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,6BAA6B,CAAC,CAAA;IACtE,CAAC;IACD,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAA;IACzC,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IACrD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAA;IAEtC,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,gBAAgB;YAC3B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,IAAA,uBAAiB,GAAE;QACvB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAA,uBAAiB,GAAE;KACxE,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,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAC9D,CAAC;IAED,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,GAAG,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,kBAAkB,aAAa,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC5I,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,WAAW,EACX,OAAO,CAAC,SAAS,EACjB,IAAI,CACL,CAAA;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -8,10 +8,10 @@ const github_1 = require("./github");
|
|
|
8
8
|
* Returns true if any structure was created, false otherwise
|
|
9
9
|
*/
|
|
10
10
|
function ensureServiceStructure(kargoPolicy, appName, env) {
|
|
11
|
+
kargoPolicy.services ??= {};
|
|
12
|
+
kargoPolicy.services[appName] ??= {};
|
|
11
13
|
const service = kargoPolicy.services[appName];
|
|
12
|
-
|
|
13
|
-
service.stages = {};
|
|
14
|
-
}
|
|
14
|
+
service.stages ??= {};
|
|
15
15
|
if (!service.stages[env]) {
|
|
16
16
|
service.stages[env] = {};
|
|
17
17
|
}
|
|
@@ -21,19 +21,27 @@ function ensureServiceStructure(kargoPolicy, appName, env) {
|
|
|
21
21
|
* Returns true if any changes were made, false otherwise
|
|
22
22
|
*/
|
|
23
23
|
function resetKargoPolicyForDefaultBranch(kargoPolicy, appName, env) {
|
|
24
|
+
if (!kargoPolicy.services?.[appName]?.stages?.[env]) {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
24
27
|
const service = kargoPolicy.services[appName];
|
|
28
|
+
const stages = service.stages;
|
|
29
|
+
if (!stages || !stages[env]) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
const stage = stages[env];
|
|
25
33
|
let hasChanged = false;
|
|
26
34
|
// Remove ephemeral branch if it exists
|
|
27
|
-
if (
|
|
28
|
-
delete
|
|
35
|
+
if (stage.ephemeralBranch) {
|
|
36
|
+
delete stage.ephemeralBranch;
|
|
29
37
|
hasChanged = true; // only commit file if we made an actual change
|
|
30
38
|
}
|
|
31
39
|
// Clean up empty env stage
|
|
32
|
-
if (Object.keys(
|
|
33
|
-
delete
|
|
40
|
+
if (Object.keys(stage).length === 0) {
|
|
41
|
+
delete stages[env];
|
|
34
42
|
}
|
|
35
43
|
// Clean up empty stages object
|
|
36
|
-
if (Object.keys(
|
|
44
|
+
if (Object.keys(stages).length === 0) {
|
|
37
45
|
delete service.stages;
|
|
38
46
|
}
|
|
39
47
|
return hasChanged;
|
|
@@ -43,8 +51,13 @@ function resetKargoPolicyForDefaultBranch(kargoPolicy, appName, env) {
|
|
|
43
51
|
* Returns true if the value changed, false if it was already set to the same value
|
|
44
52
|
*/
|
|
45
53
|
function setEphemeralBranch(kargoPolicy, appName, env, branchName) {
|
|
46
|
-
const
|
|
47
|
-
|
|
54
|
+
const service = kargoPolicy.services?.[appName];
|
|
55
|
+
const stage = service?.stages?.[env];
|
|
56
|
+
if (!stage) {
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
const currentValue = stage.ephemeralBranch;
|
|
60
|
+
stage.ephemeralBranch = branchName;
|
|
48
61
|
return currentValue !== branchName;
|
|
49
62
|
}
|
|
50
63
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kargoPolicy.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/kargoPolicy.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"kargoPolicy.js","sourceRoot":"","sources":["../../../../src/executors/preview-deploy/kargoPolicy.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,18 +7,21 @@ const logger_1 = require("../../utils/common/logger");
|
|
|
7
7
|
const datadog_1 = require("../../utils/datadog");
|
|
8
8
|
const docker_1 = require("../../utils/docker");
|
|
9
9
|
async function publishDocker(options, context, version, projectRoot, isDryRun = false) {
|
|
10
|
+
const ecrRepository = options.ecrRepository;
|
|
11
|
+
const isPublicRegistry = options.isPublicRegistry === true;
|
|
12
|
+
if (!ecrRepository) {
|
|
13
|
+
throw new Error(`ecrRepository is required for Docker publishing on project ${context.projectName}`);
|
|
14
|
+
}
|
|
10
15
|
const projectDockerfile = `${projectRoot}/Dockerfile`;
|
|
11
16
|
const registry = {
|
|
12
|
-
url:
|
|
13
|
-
|
|
14
|
-
: (0, ecr_1.getAwsEcrRegistry)(),
|
|
15
|
-
name: options.isPublicRegistry ? 'public.ecr.aws' : (0, ecr_1.getAwsEcrRegistry)(),
|
|
17
|
+
url: isPublicRegistry ? 'public.ecr.aws/payfit' : (0, ecr_1.getAwsEcrRegistry)(),
|
|
18
|
+
name: isPublicRegistry ? 'public.ecr.aws' : (0, ecr_1.getAwsEcrRegistry)(),
|
|
16
19
|
};
|
|
17
20
|
if (isDryRun) {
|
|
18
21
|
logger_1.consola.box(`Would have published docker image located at ${projectDockerfile} to repository ${options.ecrRepository} with version ${version} but --dry-run is enabled`);
|
|
19
22
|
return;
|
|
20
23
|
}
|
|
21
|
-
await (0, ecr_1.ensureEcrAuth)(registry.name,
|
|
24
|
+
await (0, ecr_1.ensureEcrAuth)(registry.name, isPublicRegistry);
|
|
22
25
|
logger_1.consola.box(`Publishing docker image to ${registry.url}/${options.ecrRepository} with version ${version}`);
|
|
23
26
|
const extraTags = Array.isArray(options.extraReleaseTags) && !version.includes('ephemeral')
|
|
24
27
|
? options.extraReleaseTags
|
|
@@ -29,21 +32,21 @@ async function publishDocker(options, context, version, projectRoot, isDryRun =
|
|
|
29
32
|
const appName = context.projectName || 'unknown-app';
|
|
30
33
|
try {
|
|
31
34
|
const ephemeralTag = `ephemeral-sha-${commitSha}`;
|
|
32
|
-
const ephemeralRef = `${registry.url}/${
|
|
33
|
-
const hasEphemeral = await (0, ecr_1.imageTagExistsInEcr)(
|
|
35
|
+
const ephemeralRef = `${registry.url}/${ecrRepository}:${ephemeralTag}`;
|
|
36
|
+
const hasEphemeral = await (0, ecr_1.imageTagExistsInEcr)(ecrRepository, ephemeralTag, isPublicRegistry);
|
|
34
37
|
if (hasEphemeral) {
|
|
35
38
|
logger_1.consola.start(`Promoting existing image ${ephemeralRef} to ${sanitizedVersion} and extra tags ${extraTags.join(', ')}`);
|
|
36
39
|
const targets = [sanitizedVersion, ...extraTags];
|
|
37
|
-
await (0, ecr_1.retagDockerImageViaAwsSdk)(
|
|
40
|
+
await (0, ecr_1.retagDockerImageViaAwsSdk)(ecrRepository, ephemeralTag, targets, isPublicRegistry);
|
|
38
41
|
logger_1.consola.success('Docker image retagged successfully!');
|
|
39
42
|
}
|
|
40
43
|
else {
|
|
41
44
|
logger_1.consola.start('Building and pushing docker image from scratch');
|
|
42
|
-
await (0, docker_1.buildAndPushDockerImage)(
|
|
45
|
+
await (0, docker_1.buildAndPushDockerImage)(ecrRepository, projectDockerfile, sanitizedVersion, sanitizedRepoUrl, commitSha, registry.url, extraTags, appName, options.buildArgs);
|
|
43
46
|
logger_1.consola.success('Docker image built and pushed successfully!');
|
|
44
47
|
}
|
|
45
48
|
if (!version.includes('ephemeral')) {
|
|
46
|
-
await (0, datadog_1.correlateDeploymentImage)(`${registry.url}/${
|
|
49
|
+
await (0, datadog_1.correlateDeploymentImage)(`${registry.url}/${ecrRepository}:${sanitizedVersion}`, sanitizedRepoUrl, commitSha);
|
|
47
50
|
}
|
|
48
51
|
}
|
|
49
52
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAkBA,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,22 +8,29 @@ const frontend_1 = require("./frontend");
|
|
|
8
8
|
const helm_1 = require("./helm");
|
|
9
9
|
const lambda_1 = require("./lambda");
|
|
10
10
|
const runExecutor = async (options, context) => {
|
|
11
|
+
const projectName = context.projectName;
|
|
12
|
+
if (!projectName) {
|
|
13
|
+
throw new Error('Missing project name in executor context.');
|
|
14
|
+
}
|
|
11
15
|
const startTime = Date.now();
|
|
12
|
-
logger_1.consola.log(`Publishing project ${
|
|
16
|
+
logger_1.consola.log(`Publishing project ${projectName} started at: ${new Date(startTime).toISOString()} `);
|
|
13
17
|
const isDryRun = process.env.NX_DRY_RUN === 'true' || options.dryRun || false;
|
|
14
|
-
const projectNode = context.projectGraph?.nodes?.[
|
|
18
|
+
const projectNode = context.projectGraph?.nodes?.[projectName];
|
|
15
19
|
if (!projectNode) {
|
|
16
|
-
throw new Error(`Project ${
|
|
20
|
+
throw new Error(`Project ${projectName} not found in project graph.`);
|
|
17
21
|
}
|
|
18
22
|
const projectData = projectNode.data;
|
|
19
23
|
const projectRoot = projectData.root;
|
|
20
24
|
// Access nxReleaseVersionData (added by nx-core release executor at runtime)
|
|
21
|
-
const versionData = options
|
|
22
|
-
if (!versionData?.[
|
|
25
|
+
const versionData = options.nxReleaseVersionData;
|
|
26
|
+
if (!versionData?.[projectName]) {
|
|
23
27
|
throw new Error('Version not found, please report it to the IDE team with the link of the CI run.');
|
|
24
28
|
}
|
|
25
|
-
const { newVersion, currentVersion } = versionData[
|
|
26
|
-
|
|
29
|
+
const { newVersion, currentVersion } = versionData[projectName];
|
|
30
|
+
if (!newVersion) {
|
|
31
|
+
throw new Error(`New version is missing for project ${projectName}`);
|
|
32
|
+
}
|
|
33
|
+
logger_1.consola.start(`Publishing ${projectName} from ${currentVersion} to ${newVersion}`);
|
|
27
34
|
// Detect artifact types at runtime
|
|
28
35
|
const artifactTypes = (0, nx_1.getProjectArtifactTypes)(projectRoot, projectData);
|
|
29
36
|
if (artifactTypes.length === 0) {
|
|
@@ -45,7 +52,7 @@ const runExecutor = async (options, context) => {
|
|
|
45
52
|
await (0, frontend_1.publishFrontend)(options, context, newVersion, projectRoot, isDryRun);
|
|
46
53
|
}
|
|
47
54
|
const timeDiff = ((Date.now() - startTime) / 1000).toFixed(2);
|
|
48
|
-
logger_1.consola.log(`Published ${
|
|
55
|
+
logger_1.consola.log(`Published ${projectName} successfully in ${timeDiff}s!`);
|
|
49
56
|
return {
|
|
50
57
|
success: true,
|
|
51
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ const s3_1 = require("../../utils/frontend/s3");
|
|
|
14
14
|
async function publishFrontend(options, context, version, projectRoot, isDryRun) {
|
|
15
15
|
const projectDist = await (0, nx_1.getDistForApp)(context);
|
|
16
16
|
const frontendArtifactsBucketName = options.frontendArtifactsBucketName;
|
|
17
|
+
if (!frontendArtifactsBucketName) {
|
|
18
|
+
throw new Error(`frontendArtifactsBucketName is required for frontend project ${context.projectName}`);
|
|
19
|
+
}
|
|
17
20
|
const frontendFilesWithoutCache = options.frontendFilesWithoutCache || [];
|
|
18
21
|
const frontendFoldersWithoutCache = options.frontendFoldersWithoutCache || [];
|
|
19
22
|
const projectTree = new tree_1.FsTree(devkit_1.workspaceRoot, false);
|
|
@@ -23,6 +26,9 @@ async function publishFrontend(options, context, version, projectRoot, isDryRun)
|
|
|
23
26
|
// nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal
|
|
24
27
|
const absoluteProjectRoot = (0, path_1.join)(devkit_1.workspaceRoot, projectRoot);
|
|
25
28
|
const ociRepository = options.frontendOciRepository;
|
|
29
|
+
if (!ociRepository) {
|
|
30
|
+
throw new Error(`frontendOciRepository is required for frontend project ${context.projectName}`);
|
|
31
|
+
}
|
|
26
32
|
// Always add version.json to files without cache
|
|
27
33
|
const filesWithoutCache = [...frontendFilesWithoutCache, 'version.json'];
|
|
28
34
|
projectTree.delete(relativeProjectDist + '/package.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../../../../src/executors/publisher/frontend.ts"],"names":[],"mappings":";;AAcA,
|
|
1
|
+
{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../../../../src/executors/publisher/frontend.ts"],"names":[],"mappings":";;AAcA,0CAsEC;AApFD,+BAAqC;AAErC,uCAA2D;AAC3D,iDAA+C;AAE/C,0DAAsE;AACtE,4DAA2D;AAC3D,gDAA0D;AAC1D,sDAAmD;AACnD,8CAAqD;AACrD,gDAAuD;AACvD,gDAAkD;AAG3C,KAAK,UAAU,eAAe,CACnC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,QAAiB;IAEjB,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,OAAO,CAAC,CAAA;IAChD,MAAM,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAA;IACvE,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CACb,gEAAgE,OAAO,CAAC,WAAW,EAAE,CACtF,CAAA;IACH,CAAC;IACD,MAAM,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,IAAI,EAAE,CAAA;IACzE,MAAM,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,IAAI,EAAE,CAAA;IAC7E,MAAM,WAAW,GAAG,IAAI,aAAM,CAAC,sBAAa,EAAE,KAAK,CAAC,CAAA;IACpD,MAAM,YAAY,GAAG,QAAQ,2BAA2B,IAAI,OAAO,EAAE,CAAA;IACrE,mHAAmH;IACnH,MAAM,mBAAmB,GAAG,IAAA,eAAQ,EAAC,sBAAa,EAAE,WAAW,CAAC,CAAA;IAChE,mHAAmH;IACnH,MAAM,mBAAmB,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,WAAW,CAAC,CAAA;IAC5D,MAAM,aAAa,GAAG,OAAO,CAAC,qBAAqB,CAAA;IACnD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CACb,0DAA0D,OAAO,CAAC,WAAW,EAAE,CAChF,CAAA;IACH,CAAC;IAED,iDAAiD;IACjD,MAAM,iBAAiB,GAAG,CAAC,GAAG,yBAAyB,EAAE,cAAc,CAAC,CAAA;IAExE,WAAW,CAAC,MAAM,CAAC,mBAAmB,GAAG,eAAe,CAAC,CAAA;IAEzD,IAAI,QAAQ,EAAE,CAAC;QACb,gBAAO,CAAC,GAAG,CACT,mDAAmD,WAAW,iBAAiB,2BAA2B,IAAI,OAAO,iBAAiB,OAAO,2BAA2B,CACzK,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,IAAA,uBAAY,GAAE,CAAA;IAEpB,gBAAO,CAAC,GAAG,CACT,2CAA2C,2BAA2B,IAAI,OAAO,iBAAiB,OAAO,EAAE,CAC5G,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAA;IAC1C,MAAM,IAAA,aAAQ,EACZ,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,EACjB,2BAA2B,EAC3B,mCAAmC,CACpC,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAA;IACtD,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,mBAAmB,EAAE,cAAc,CAAC,CAAA;IACjE,gBAAO,CAAC,GAAG,CACT,8BAA8B,IAAA,uBAAiB,GAAE,IAAI,aAAa,IAAI,OAAO,EAAE,CAChF,CAAA;IACD,MAAM,IAAA,qBAAU,EAAC,IAAA,uBAAiB,GAAE,CAAC,CAAA;IACrC,MAAM,IAAA,oBAAc,EAClB,aAAa,EACb,OAAO,EACP,eAAe,EACf,wBAAY,CAAC,QAAQ,EACrB,IAAA,uBAAiB,GAAE,EACnB,YAAY,CACb,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,yCAAyC,CAAC,CAAA;AAC5D,CAAC"}
|
|
@@ -12,6 +12,9 @@ const helm_1 = require("../../utils/helm");
|
|
|
12
12
|
async function publishHelm(options, context, version, projectRoot, isDryRun) {
|
|
13
13
|
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
14
14
|
try {
|
|
15
|
+
if (!options.chartRegistry) {
|
|
16
|
+
throw new Error(`chartRegistry is required for Helm publishing on project ${context.projectName}`);
|
|
17
|
+
}
|
|
15
18
|
const tempArtifactDir = (0, nx_1.getTempArtifactDir)(context);
|
|
16
19
|
const sanitizedVersion = (0, docker_1.getShortVersion)(version);
|
|
17
20
|
const helmChartFolder = options.helmChartFolder || '.deploy';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":";;AAoBA,
|
|
1
|
+
{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,19 @@ const publish_1 = require("../../utils/lambda/publish");
|
|
|
30
30
|
async function publishLambda(options, context, version, projectRoot, isDryRun, artifactTypes) {
|
|
31
31
|
const projectDist = await (0, nx_1.getDistForApp)(context);
|
|
32
32
|
const tempArtifactDir = (0, nx_1.getTempArtifactDir)(context);
|
|
33
|
+
const projectName = context.projectName ?? 'unknown-project';
|
|
34
|
+
const lambdaFunctions = options.lambdaFunctions;
|
|
35
|
+
const lambdaStacks = options.lambdaStacks;
|
|
36
|
+
const lambdaBucket = options.lambdaBucket;
|
|
37
|
+
if (!lambdaFunctions || lambdaFunctions.length === 0) {
|
|
38
|
+
throw new Error(`lambdaFunctions is required for Lambda publishing on project ${projectName}`);
|
|
39
|
+
}
|
|
40
|
+
if (!lambdaStacks || lambdaStacks.length === 0) {
|
|
41
|
+
throw new Error(`lambdaStacks is required for Lambda publishing on project ${projectName}`);
|
|
42
|
+
}
|
|
43
|
+
if (!lambdaBucket) {
|
|
44
|
+
throw new Error(`lambdaBucket is required for Lambda publishing on project ${projectName}`);
|
|
45
|
+
}
|
|
33
46
|
// Docker-based Lambda requires explicit lambdaOciRepository (ZIP Lambda has fallback)
|
|
34
47
|
if (artifactTypes.includes(constants_1.ArtifactType.DOCKER) &&
|
|
35
48
|
!options.lambdaOciRepository) {
|
|
@@ -41,13 +54,15 @@ async function publishLambda(options, context, version, projectRoot, isDryRun, a
|
|
|
41
54
|
// Remove any characters that are not alphanumeric, hyphen, or underscore
|
|
42
55
|
// remove the @payfit/ prefix if it exists
|
|
43
56
|
const sanitizedProjectName = context.projectName
|
|
44
|
-
.
|
|
45
|
-
|
|
57
|
+
? context.projectName
|
|
58
|
+
.replace(/^@payfit\//, '')
|
|
59
|
+
.replace(/[^a-zA-Z0-9-_]/g, '-')
|
|
60
|
+
: projectName;
|
|
46
61
|
const zipName = `${version}.zip`;
|
|
47
|
-
const zipFileNameS3 = `${
|
|
62
|
+
const zipFileNameS3 = `${lambdaBucket}/${repoName}/${sanitizedProjectName}/${zipName}`;
|
|
48
63
|
// Validate health check payloads are valid JSON
|
|
49
|
-
for (let i = 0; i <
|
|
50
|
-
const lambdaFunction =
|
|
64
|
+
for (let i = 0; i < lambdaFunctions.length; i++) {
|
|
65
|
+
const lambdaFunction = lambdaFunctions[i];
|
|
51
66
|
const payload = lambdaFunction.healthCheckPayload;
|
|
52
67
|
try {
|
|
53
68
|
JSON.parse(payload);
|
|
@@ -75,11 +90,11 @@ async function publishLambda(options, context, version, projectRoot, isDryRun, a
|
|
|
75
90
|
}
|
|
76
91
|
// When we create the spacelift stack, we also run the smoke tests so we should not publish to ECR if the tests fails
|
|
77
92
|
logger_1.consola.box(`Creating new Lambda version and running smoke tests`);
|
|
78
|
-
await (0, publish_1.createLambdaVersion)(
|
|
93
|
+
await (0, publish_1.createLambdaVersion)(lambdaStacks, lambdaFunctions, version);
|
|
79
94
|
const packageJsonPath = (0, path_1.join)(projectDist, 'package.json');
|
|
80
95
|
logger_1.consola.info(`Pushing OCI Artifact to ECR ${(0, ecr_1.getAwsEcrRegistry)()}/${options.lambdaOciRepository}:${version}`);
|
|
81
96
|
await (0, aws_auth_1.loginToEcr)((0, ecr_1.getAwsEcrRegistry)());
|
|
82
|
-
await (0, oci_1.pushImageToEcr)(options.lambdaOciRepository, version, packageJsonPath, constants_1.ArtifactType.LAMBDA, (0, ecr_1.getAwsEcrRegistry)(), artifactPath);
|
|
97
|
+
await (0, oci_1.pushImageToEcr)(options.lambdaOciRepository ?? projectName, version, packageJsonPath, constants_1.ArtifactType.LAMBDA, (0, ecr_1.getAwsEcrRegistry)(), artifactPath);
|
|
83
98
|
logger_1.consola.success(`Lambda version ${version} successfully created and smoke tests passed, your lambda is ready to be promoted in Kargo !`);
|
|
84
99
|
}
|
|
85
100
|
//# sourceMappingURL=lambda.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AA+BA,
|
|
1
|
+
{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../src/executors/publisher/lambda.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,11 @@ const METADATA_EXTRACTORS = [
|
|
|
28
28
|
// Replace ${CIRCLE_PROJECT_REPONAME} with actual repo name if needed
|
|
29
29
|
if (chartRegistry.includes('${CIRCLE_PROJECT_REPONAME}')) {
|
|
30
30
|
// Get repo name from git
|
|
31
|
-
|
|
31
|
+
const repositoryName = await (0, github_1.getGitRepositoryName)();
|
|
32
|
+
if (!repositoryName) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
return chartRegistry.replace('${CIRCLE_PROJECT_REPONAME}', repositoryName);
|
|
32
36
|
}
|
|
33
37
|
return chartRegistry;
|
|
34
38
|
},
|
|
@@ -156,7 +160,7 @@ async function processCircleCIMetadata(tree, projectCircleCIPath, projectRoot) {
|
|
|
156
160
|
});
|
|
157
161
|
}
|
|
158
162
|
function injectNxReleaseConfiguration(tree, packageJsonName) {
|
|
159
|
-
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
163
|
+
const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
|
|
160
164
|
nxJson.release = {
|
|
161
165
|
projectsRelationship: 'independent',
|
|
162
166
|
projects: ['*', `!${packageJsonName}`],
|
|
@@ -223,7 +227,11 @@ function injectRootProjectJsonConfiguration(tree, packageJsonName) {
|
|
|
223
227
|
}
|
|
224
228
|
}
|
|
225
229
|
function getPackageJsonName(tree) {
|
|
226
|
-
const
|
|
230
|
+
const packageJsonContent = tree.read('package.json')?.toString();
|
|
231
|
+
if (!packageJsonContent) {
|
|
232
|
+
throw new Error('package.json not found in workspace root');
|
|
233
|
+
}
|
|
234
|
+
const packageJson = JSON.parse(packageJsonContent);
|
|
227
235
|
return /@{1}\w+\/{1}\w+/.test(packageJson?.name)
|
|
228
236
|
? packageJson?.name
|
|
229
237
|
: `@payfit/${packageJson?.name}`;
|
|
@@ -259,7 +267,7 @@ async function initGenerator(tree, options = {}) {
|
|
|
259
267
|
(currentCircleCiFile &&
|
|
260
268
|
currentCircleCiFile.includes('edp: payfit/edp@0')) ||
|
|
261
269
|
false;
|
|
262
|
-
if (keepEdpJob) {
|
|
270
|
+
if (keepEdpJob && currentCircleCiFile) {
|
|
263
271
|
edpJobs = extractEdpJobs(currentCircleCiFile);
|
|
264
272
|
}
|
|
265
273
|
let dockerProjectsCount = 0;
|
|
@@ -310,9 +318,13 @@ async function initGenerator(tree, options = {}) {
|
|
|
310
318
|
}
|
|
311
319
|
const nodeVersion = defaultNodeVersion || options.nodeVersion?.trim();
|
|
312
320
|
const providedDomainDeployRepoName = options.domainDeployRepoName?.trim();
|
|
321
|
+
const repositoryName = await (0, github_1.getGitRepositoryName)();
|
|
322
|
+
if (!providedDomainDeployRepoName && !repositoryName) {
|
|
323
|
+
throw new Error('Unable to determine current repository name from git.');
|
|
324
|
+
}
|
|
313
325
|
const domainDeployRepoName = providedDomainDeployRepoName
|
|
314
326
|
? providedDomainDeployRepoName
|
|
315
|
-
: `${
|
|
327
|
+
: `${repositoryName}-deploy`;
|
|
316
328
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'globalFiles'), '.', {
|
|
317
329
|
keepContinuationJobs: keepContinuationJobs,
|
|
318
330
|
keepEdpJob: keepEdpJob,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/generators/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,15 +11,15 @@ interface LambdaTerraformConfiguration {
|
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
13
|
export declare function getLambdaTerraformConfiguration(tree: Tree, projectRoot: string, lambdaName: string): Promise<{
|
|
14
|
-
environmentVariables:
|
|
15
|
-
secrets:
|
|
16
|
-
ssmParameters:
|
|
14
|
+
environmentVariables: Record<string, string>;
|
|
15
|
+
secrets: Record<string, string>;
|
|
16
|
+
ssmParameters: Record<string, string>;
|
|
17
17
|
config: {
|
|
18
|
-
runtime:
|
|
19
|
-
handler:
|
|
20
|
-
timeout:
|
|
18
|
+
runtime: string;
|
|
19
|
+
handler: string;
|
|
20
|
+
timeout: number;
|
|
21
21
|
};
|
|
22
|
-
}>;
|
|
22
|
+
} | null | undefined>;
|
|
23
23
|
export declare function createEnvFile(tree: Tree, projectRoot: string, lambdaName: string, lambdaTerraformConfiguration: LambdaTerraformConfiguration): Promise<void>;
|
|
24
24
|
export declare function generateDockerComposeFile(tree: Tree): void;
|
|
25
25
|
export declare function createJsonEventFile(tree: Tree, projectRoot: string, lambdaName: string): Promise<void>;
|
|
@@ -31,13 +31,24 @@ async function getLambdaTerraformConfiguration(tree, projectRoot, lambdaName) {
|
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
33
|
const terraformFile = tree.read(filePath, 'utf-8');
|
|
34
|
+
if (!terraformFile) {
|
|
35
|
+
continue;
|
|
36
|
+
}
|
|
34
37
|
const ast = await (0, hcl2json_1.parse)(filePath, terraformFile);
|
|
35
|
-
if (
|
|
38
|
+
if (typeof ast !== 'object' ||
|
|
39
|
+
ast === null ||
|
|
40
|
+
!('module' in ast) ||
|
|
41
|
+
typeof ast.module !== 'object' ||
|
|
42
|
+
ast.module === null) {
|
|
36
43
|
continue;
|
|
37
44
|
}
|
|
38
|
-
|
|
45
|
+
const modules = ast.module;
|
|
46
|
+
for (const astModule of Object.values(modules)) {
|
|
47
|
+
if (!Array.isArray(astModule) || astModule.length === 0) {
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
39
50
|
const module = astModule[0];
|
|
40
|
-
if (module.source
|
|
51
|
+
if (module.source?.includes('lambda') && module.name === lambdaName) {
|
|
41
52
|
return {
|
|
42
53
|
environmentVariables: module.environment_variables ?? DEFAULT_VALUES.environmentVariables,
|
|
43
54
|
secrets: module.secrets ?? DEFAULT_VALUES.secrets,
|
|
@@ -126,20 +137,22 @@ async function createJsonEventFile(tree, projectRoot, lambdaName) {
|
|
|
126
137
|
tree.write(`${projectRoot}/events/${lambdaName}.json`, event);
|
|
127
138
|
}
|
|
128
139
|
function updateProjectJson(tree, lambdaName, projectConfiguration, lambdaTerraformConfiguration) {
|
|
140
|
+
const projectName = projectConfiguration.name ?? path.basename(projectConfiguration.root);
|
|
141
|
+
const targets = (projectConfiguration.targets ??= {});
|
|
129
142
|
const commands = [
|
|
130
|
-
`sh ./scripts/invoke_lambda_local.sh ${lambdaName} ${
|
|
143
|
+
`sh ./scripts/invoke_lambda_local.sh ${lambdaName} ${projectName} ${projectConfiguration.root} ${lambdaTerraformConfiguration.config.runtime} ${lambdaTerraformConfiguration.config.handler} ${lambdaTerraformConfiguration.config.timeout}`,
|
|
131
144
|
];
|
|
132
|
-
|
|
145
|
+
targets['start-localstack'] = {
|
|
133
146
|
executor: 'nx:run-commands',
|
|
134
147
|
options: {
|
|
135
148
|
cwd: '{workspaceRoot}',
|
|
136
149
|
command: 'docker compose --file docker-compose.yml up --detach --wait --no-recreate --quiet-pull',
|
|
137
150
|
},
|
|
138
151
|
};
|
|
139
|
-
if (
|
|
140
|
-
commands.push(...
|
|
152
|
+
if (targets['lambda-local-invoke']?.options?.commands) {
|
|
153
|
+
commands.push(...targets['lambda-local-invoke'].options.commands);
|
|
141
154
|
}
|
|
142
|
-
|
|
155
|
+
targets['lambda-local-invoke'] = {
|
|
143
156
|
executor: 'nx:run-commands',
|
|
144
157
|
dependsOn: ['build', 'start-localstack'],
|
|
145
158
|
options: {
|
|
@@ -148,7 +161,7 @@ function updateProjectJson(tree, lambdaName, projectConfiguration, lambdaTerrafo
|
|
|
148
161
|
parallel: false,
|
|
149
162
|
},
|
|
150
163
|
};
|
|
151
|
-
(0, devkit_1.updateProjectConfiguration)(tree,
|
|
164
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
|
|
152
165
|
}
|
|
153
166
|
function generateScripts(tree) {
|
|
154
167
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files', 'scripts'), './scripts', {});
|