@payfit/nx-core 4.11.1-beta-fix-path-conformance.3 → 4.12.0

package/dist/src/executors/publisher/docker.js

@@ -5,6 +5,7 @@ const fs = require("node:fs");
 const path_1 = require("path");
 const aws_auth_1 = require("../../utils/aws-auth");
 const docker_1 = require("../../utils/docker");
+const github_1 = require("../../utils/github");
 async function publishDocker(options, context, version) {
     await (0, aws_auth_1.checkAwsAuth)();
     await (0, aws_auth_1.loginToEcr)();
@@ -14,7 +15,7 @@ async function publishDocker(options, context, version) {
         throw new Error('Dockerfile not found in project root');
     }
     console.log('Building docker image with version ' + version);
-    await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version);
+    await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version, await (0, github_1.getSanitizedCurrentGitRepoUrl)(), await (0, github_1.getCurrentGitCommitSha)());
     console.log(`Publishing docker image to ${options.ecrRegistry} with version ${version}`);
     return await (0, aws_auth_1.pushImageToEcr)(options.ecrRegistry, version);
 }

package/dist/src/executors/publisher/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AASA,sCAwBC;AAjCD,8BAA6B;AAC7B,+BAA2B;AAI3B,mDAA+E;AAC/E,+CAAqD;AAG9C,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe;IAIf,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,GAAE,CAAA;IAElB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAA;IACnE,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAEzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC5D,MAAM,IAAA,yBAAgB,EAAC,OAAO,CAAC,WAAW,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAEvE,OAAO,CAAC,GAAG,CACT,8BAA8B,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5E,CAAA;IACD,OAAO,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAaA,sCA8BC;AA3CD,8BAA6B;AAC7B,+BAA2B;AAI3B,mDAA+E;AAC/E,+CAAqD;AACrD,+CAG2B;AAGpB,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe;IAIf,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,GAAE,CAAA;IAElB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAA;IACnE,MAAM,iBAAiB,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAEzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,qCAAqC,GAAG,OAAO,CAAC,CAAA;IAC5D,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,CAC/B,CAAA;IAED,OAAO,CAAC,GAAG,CACT,8BAA8B,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5E,CAAA;IACD,OAAO,MAAM,IAAA,yBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC3D,CAAC"}

package/dist/src/utils/docker.d.ts

@@ -7,12 +7,14 @@ export declare function getDockerOrPodman(): Promise<string>;
 /**
  * Builds a Docker image using the provided Dockerfile.
  *
- * @param imageName The name of the image to build.
- * @param dockerfilePath The path to the Dockerfile.
- * @param version The version of the image to build.
+ * @param imageName
+ * @param dockerfilePath
+ * @param version
+ * @param gitRepoUrl
+ * @param commitSha
  * @return {Promise<{success: boolean, stdout: string, stderr: string}>} A promise that resolves to an object containing the success status, stdout, and stderr of the command.
  */
-export declare function buildDockerImage(imageName: string, dockerfilePath: string, version: string): Promise<{
+export declare function buildDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string): Promise<{
     success: boolean;
     stdout: string;
     stderr: string;

package/dist/src/utils/docker.js

@@ -21,13 +21,15 @@ async function getDockerOrPodman() {
 /**
  * Builds a Docker image using the provided Dockerfile.
  *
- * @param imageName The name of the image to build.
- * @param dockerfilePath The path to the Dockerfile.
- * @param version The version of the image to build.
+ * @param imageName
+ * @param dockerfilePath
+ * @param version
+ * @param gitRepoUrl
+ * @param commitSha
  * @return {Promise<{success: boolean, stdout: string, stderr: string}>} A promise that resolves to an object containing the success status, stdout, and stderr of the command.
  */
-async function buildDockerImage(imageName, dockerfilePath, version) {
+async function buildDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha) {
     const dockerOrPodman = await getDockerOrPodman();
-    return (0, exec_1.exec_command)(`${dockerOrPodman} buildx build -t ${process.env.AWS_ECR_REGISTRY}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN  .`);
+    return (0, exec_1.exec_command)(`${dockerOrPodman} buildx build -t ${process.env.AWS_ECR_REGISTRY}/${imageName}:${version} -f ${dockerfilePath} --secret id=NPM_TOKEN . --build-arg DD_GIT_REPOSITORY_URL=${gitRepoUrl} --build-arg DD_GIT_COMMIT_SHA=${commitSha}`);
 }
 //# sourceMappingURL=docker.js.map

package/dist/src/utils/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;AAOA,8CAQC;AAUD,4CASC;AAlCD,iCAAqC;AAErC;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,mBAAY,EAAC,kBAAkB,CAAC,CAAA;QACtC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe;IAEf,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,mBAAY,EACjB,GAAG,cAAc,oBAAoB,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,2BAA2B,CAC1I,CAAA;AACH,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;AAOA,8CAQC;AAYD,4CAWC;AAtCD,iCAAqC;AAErC;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,mBAAY,EAAC,kBAAkB,CAAC,CAAA;QACtC,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB;IAEjB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,mBAAY,EACjB,GAAG,cAAc,oBAAoB,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,8DAA8D,UAAU,kCAAkC,SAAS,EAAE,CACpO,CAAA;AACH,CAAC"}

package/dist/src/utils/github.d.ts

@@ -2,3 +2,11 @@
  * Get sanitized current git branch name
  */
 export declare function getSanitizedCurrentGitBranch(): Promise<string>;
+/**
+ * Get current commit sha
+ */
+export declare function getCurrentGitCommitSha(): Promise<string>;
+/**
+ * Get sanitized current repo url
+ */
+export declare function getSanitizedCurrentGitRepoUrl(): Promise<string>;

package/dist/src/utils/github.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSanitizedCurrentGitBranch = getSanitizedCurrentGitBranch;
+exports.getCurrentGitCommitSha = getCurrentGitCommitSha;
+exports.getSanitizedCurrentGitRepoUrl = getSanitizedCurrentGitRepoUrl;
 const exec_1 = require("./exec");
 /**
  * Get sanitized current git branch name
@@ -14,4 +16,24 @@ async function getSanitizedCurrentGitBranch() {
             .replace(/[^a-z0-9]/g, '')
         : '';
 }
+/**
+ * Get current commit sha
+ */
+async function getCurrentGitCommitSha() {
+    const commitSha = await (0, exec_1.exec_command)(`git rev-parse HEAD`);
+    return commitSha.success ? commitSha.stdout : '';
+}
+/**
+ * Get sanitized current repo url
+ */
+async function getSanitizedCurrentGitRepoUrl() {
+    const repoUrlExec = await (0, exec_1.exec_command)(`git config --get remote.origin.url`);
+    if (repoUrlExec.success) {
+        const repoUrlMatching = repoUrlExec.stdout.match(/github\.com[:/]PayFit\/[^/]+/);
+        if (repoUrlMatching && repoUrlMatching.length > 0) {
+            return `https://${repoUrlMatching[0].trim().replace(':', '/').replace('.git', '')}`;
+        }
+    }
+    return '';
+}
 //# sourceMappingURL=github.js.map

package/dist/src/utils/github.js.map

@@ -1 +1 @@
-{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAbD,iCAAqC;AAErC;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,2BAA2B,CAAC,CAAA;IAClE,OAAO,UAAU,CAAC,OAAO;QACvB,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAA;AACR,CAAC"}
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../../src/utils/github.ts"],"names":[],"mappings":";;AAKA,oEAQC;AAKD,wDAGC;AAKD,sEAWC;AArCD,iCAAqC;AAErC;;GAEG;AACI,KAAK,UAAU,4BAA4B;IAChD,MAAM,UAAU,GAAG,MAAM,IAAA,mBAAY,EAAC,2BAA2B,CAAC,CAAA;IAClE,OAAO,UAAU,CAAC,OAAO;QACvB,CAAC,CAAC,UAAU,CAAC,MAAM;aACd,IAAI,EAAE;aACN,WAAW,EAAE;aACb,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QAC9B,CAAC,CAAC,EAAE,CAAA;AACR,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,sBAAsB;IAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAY,EAAC,oBAAoB,CAAC,CAAA;IAC1D,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;AAClD,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,6BAA6B;IACjD,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAY,EAAC,oCAAoC,CAAC,CAAA;IAC5E,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;QACxB,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.11.1-beta-fix-path-conformance.3",
+  "version": "4.12.0",
   "type": "commonjs",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",