@payfit/nx-core 4.33.4-ephemeral-hello-lambda-0bbe822.0 → 4.33.4-ephemeral-hello-lambda-16cf697.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.33.4-ephemeral-hello-lambda-0bbe822.0",
+  "version": "4.33.4-ephemeral-hello-lambda-16cf697.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/executors/publisher/lambda.js

@@ -4,12 +4,11 @@ exports.publishLambda = publishLambda;
 const fs = require("node:fs");
 const path_1 = require("path");
 const aws_auth_1 = require("../../utils/aws-auth");
-const constants_1 = require("../../utils/constants");
 const github_1 = require("../../utils/github");
 const lambda_1 = require("../../utils/lambda");
 const logger_1 = require("../../utils/logger");
-const s3_1 = require("../../utils/s3");
 const oci_1 = require("../../utils/oci");
+const s3_1 = require("../../utils/s3");
 // 1 create an archive file (zip) from the ./dist/hello-lambda
 // 2 push the archive file in a s3 bucket
 // 3 create an OCI artefact
@@ -20,10 +19,7 @@ async function publishLambda(options, context, version, projectRoot, projectDist
     const repoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
     const repoName = repoUrl.split('/').pop() ?? 'unknown-repo';
     const zipName = `${context.projectName}-${version}.zip`;
-    const lambdaBucket = options.lambdaBucket
-        ? options.lambdaBucket
-        : constants_1.LAMBDA_ARTEFACTS_BUCKET;
-    const zipFileNameS3 = `${lambdaBucket}/${repoName}/${zipName}`;
+    const zipFileNameS3 = `${options.lambdaBucket}/${repoName}/${zipName}`;
     if (!gitBranchName)
         throw new Error('Unable to get current Git branch');
     if (!fs.existsSync(projectLambda)) {
@@ -38,6 +34,7 @@ async function publishLambda(options, context, version, projectRoot, projectDist
     logger_1.consola.info(`Uploading ${zipPath} to S3 at ${zipFileNameS3}`);
     await (0, s3_1.pushToS3)(zipPath, zipFileNameS3);
     const packageJsonPath = (0, path_1.join)(projectDist, 'package.json');
+    logger_1.consola.info(`Pushing empty image to ECR ${options.lambdaRegistry}:${version}`);
     await (0, oci_1.pushEmptyImageToEcr)(options.lambdaRegistry, version, packageJsonPath);
     logger_1.consola.success('Lambda artifact successfully pushed to S3!');
 }

package/src/executors/publisher/lambda.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AAsBA,sCAwCC;AA9DD,8BAA6B;AAC7B,+BAA2B;AAI3B,mDAAmD;AACnD,qDAA+D;AAC/D,+CAG2B;AAC3B,+CAA8C;AAC9C,+CAA4C;AAC5C,uCAAyC;AAEzC,yCAAsD;AAEtD,8DAA8D;AAC9D,yCAAyC;AACzC,2BAA2B;AAC3B,iCAAiC;AAE1B,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;IAEnB,MAAM,aAAa,GAAG,GAAG,WAAW,UAAU,CAAA;IAC9C,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,YAAY,GAAG,OAAO,CAAC,YAAY;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY;QACtB,CAAC,CAAC,mCAAuB,CAAA;IAC3B,MAAM,aAAa,GAAG,GAAG,YAAY,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAA;IAE9D,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAEvE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,gBAAO,CAAC,IAAI,CAAC,6BAA6B,aAAa,YAAY,CAAC,CAAA;QACpE,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,MAAM,IAAA,yBAAmB,EAAC,OAAO,CAAC,cAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAA;IAE1E,gBAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAA;AAC/D,CAAC"}
+{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AAqBA,sCAwCC;AA7DD,8BAA6B;AAC7B,+BAA2B;AAI3B,mDAAmD;AACnD,+CAG2B;AAC3B,+CAA8C;AAC9C,+CAA4C;AAC5C,yCAAqD;AACrD,uCAAyC;AAGzC,8DAA8D;AAC9D,yCAAyC;AACzC,2BAA2B;AAC3B,iCAAiC;AAE1B,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB;IAEnB,MAAM,aAAa,GAAG,GAAG,WAAW,UAAU,CAAA;IAC9C,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,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,gBAAO,CAAC,IAAI,CAAC,6BAA6B,aAAa,YAAY,CAAC,CAAA;QACpE,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,cAAc,IAAI,OAAO,EAAE,CAClE,CAAA;IACD,MAAM,IAAA,yBAAmB,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,CAAC,CAAA;IAE3E,gBAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAA;AAC/D,CAAC"}

package/src/executors/publisher/schema.json

@@ -21,6 +21,15 @@
       "type": "boolean",
       "description": "Whether to use the public ECR registry",
       "default": false
+    },
+    "lambdaBucket": {
+      "type": "string",
+      "description": "The S3 bucket for lambda",
+      "default": "payfit-shared-lambda-artifacts"
+    },
+    "lambdaRegistry": {
+      "type": "string",
+      "description": "The OCI registry for lambda"
     }
   },
   "required": []

package/src/utils/oci.js

@@ -3,6 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushEmptyImageToEcr = pushEmptyImageToEcr;
 const exec_1 = require("./exec");
 async function pushEmptyImageToEcr(lambdaEcrRepository, tag, pathToPackageJson) {
-    (0, exec_1.exec)(`oras push ${process.env.AWS_ECR_REGISTRY}/${lambdaEcrRepository}:${tag} --artifact-type application/vnd.payfit.lambda.manifest ${pathToPackageJson}`);
+    if (!process.env.AWS_ECR_REGISTRY) {
+        throw new Error('AWS_ECR_REGISTRY environment variable is not set');
+    }
+    if (!lambdaEcrRepository) {
+        throw new Error('Lambda ECR repository is not provided');
+    }
+    if (!tag) {
+        throw new Error('Tag is not provided');
+    }
+    if (!pathToPackageJson) {
+        throw new Error('Path to package.json is not provided');
+    }
+    (0, exec_1.exec)(`oras push ${process.env.AWS_ECR_REGISTRY}/${lambdaEcrRepository}:${tag} --artifact-type application/vnd.payfit.lambda.manifest ${pathToPackageJson}`, {
+        throwOnError: true,
+    });
 }
 //# sourceMappingURL=oci.js.map

package/src/utils/oci.js.map

@@ -1 +1 @@
-{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/oci.ts"],"names":[],"mappings":";;AAEA,kDAEC;AAJD,iCAA6B;AAEtB,KAAK,UAAU,mBAAmB,CAAC,mBAA2B,EAAE,GAAW,EAAE,iBAAyB;IAC3G,IAAA,WAAI,EAAC,aAAa,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,mBAAmB,IAAI,GAAG,2DAA2D,iBAAiB,EAAE,CAAC,CAAA;AAC7J,CAAC"}
+{"version":3,"file":"oci.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/oci.ts"],"names":[],"mappings":";;AAEA,kDAuBC;AAzBD,iCAA6B;AAEtB,KAAK,UAAU,mBAAmB,CACvC,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,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAA;IAC1D,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACxC,CAAC;IACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IACzD,CAAC;IACD,IAAA,WAAI,EACF,aAAa,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,mBAAmB,IAAI,GAAG,2DAA2D,iBAAiB,EAAE,EACrJ;QACE,YAAY,EAAE,IAAI;KACnB,CACF,CAAA;AACH,CAAC"}

package/src/utils/constants.d.ts

@@ -1,4 +0,0 @@
-/**
- * Constants used throughout the nx-core package
- */
-export declare const LAMBDA_ARTEFACTS_BUCKET = "payfit-shared-lambda-artifacts";

package/src/utils/constants.js

@@ -1,8 +0,0 @@
-"use strict";
-/**
- * Constants used throughout the nx-core package
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LAMBDA_ARTEFACTS_BUCKET = void 0;
-exports.LAMBDA_ARTEFACTS_BUCKET = 'payfit-shared-lambda-artifacts';
-//# sourceMappingURL=constants.js.map

package/src/utils/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/constants.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEU,QAAA,uBAAuB,GAAG,gCAAgC,CAAA"}