@catladder/cli 0.0.0-inventory-53a24d70 → 0.0.0-inventory-2ef22dde

package/dist/bundles/catenv/index.js

@@ -38691,12 +38691,14 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createBuildJob = void 0;
+exports.createBuildJob = exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES = void 0;
 
 var lodash_1 = __nccwpck_require__(3255);
 
 var __1 = __nccwpck_require__(5355);
 
+var reportingJob_1 = __nccwpck_require__(9572);
+
 var utils_1 = __nccwpck_require__(7461);
 
 var yarn_1 = __nccwpck_require__(464);
@@ -38705,6 +38707,8 @@ var constants_1 = __nccwpck_require__(1542);
 
 var getBuildInfo_1 = __nccwpck_require__(9197);
 
+exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES = reportingJob_1.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX + "_app.json";
+
 var createBuildJob = function (context, _a) {
   var _b, _c;
 
@@ -38722,7 +38726,7 @@ var createBuildJob = function (context, _a) {
     variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
     artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json"]
+      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/" + exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES]
     }
   }, def);
 };
@@ -39076,7 +39080,7 @@ var constants_2 = __nccwpck_require__(9284);
 var yarn_1 = __nccwpck_require__(464);
 
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
 
   var buildConfig = context.componentConfig.build;
 
@@ -39085,17 +39089,19 @@ var createNodeBuildJobs = function (context) {
   }
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  var yarnReportDependenciesListCommand = ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) ? "npm ls --depth 0 --json | jq '.dependencies | to_entries | .[] | {artifact: .key, version: .value.version, type: \"npm\"}'" : "yarn info --json -A| jq '{version: .children.Version, artifact: .value, type: \"npm\" }'";
+  var yarnReportDependenciesCommand = yarnReportDependenciesListCommand + " | jq -n '. |= [inputs]' > " + createBuildJob_1.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES;
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    script: __spreadArray(__spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false), [yarnReportDependenciesCommand], false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_d = (_c = buildConfig.artifactsPaths) === null || _c === void 0 ? void 0 : _c.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false)
+      })) !== null && _d !== void 0 ? _d : []), false)
     }
   }) : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
@@ -39107,18 +39113,12 @@ var createNodeBuildJobs = function (context) {
         prodOnly: true,
         noScripts: true
       }),
-      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_f = (_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+      })) === null || _f === void 0 ? void 0 : _f.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false), [{
-    envMode: "stagePerEnv",
-    stage: "build",
-    name: "Inventory report: deploy",
-    script: ["cd ".concat(context.componentConfig.dir), "yarn info --name-only --json "],
-    variables: {}
-  }], false);
+  })] : []), false);
 };
 
 exports.createNodeBuildJobs = createNodeBuildJobs;
@@ -39831,7 +39831,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "inventory-53a24d70" || 0;
+exports.PIPELINE_IMAGE_TAG = "inventory-2ef22dde" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42193,6 +42193,42 @@ __exportStar(__nccwpck_require__(223), exports);
 
 /***/ }),
 
+/***/ 9572:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createInventoryReporitngJob = exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX = void 0;
+
+var lodash_1 = __nccwpck_require__(3255);
+
+exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX = "__inventory_dependencies";
+
+var createInventoryReporitngJob = function (context) {
+  var inventoryTemplate = {
+    appName: context.fullConfig.appName,
+    customerName: context.fullConfig.customerName,
+    componentName: context.componentName,
+    environment: (0, lodash_1.pick)(context.environment, ["shortName", "fullName", "host", "url"]),
+    build: context.componentConfig.build,
+    deploy: context.componentConfig.deploy
+  };
+  var printDepsCommand = "echo '".concat(JSON.stringify(inventoryTemplate), "' | jq --argjson dependencies \"$(echo ").concat(exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX, " | jq -n '. |= [inputs]')\" '. + {dependencies: $dependencies}'");
+  return {
+    envMode: "jobPerEnv",
+    name: "inventory:reporting",
+    stage: "reporting",
+    variables: {},
+    script: [printDepsCommand]
+  };
+};
+
+exports.createInventoryReporitngJob = createInventoryReporitngJob;
+
+/***/ }),
+
 /***/ 8974:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -42695,6 +42731,8 @@ var context_1 = __nccwpck_require__(2041);
 
 var deploy_1 = __nccwpck_require__(223);
 
+var reportingJob_1 = __nccwpck_require__(9572);
+
 var utils_1 = __nccwpck_require__(7461);
 
 var makeGitlabJob_1 = __nccwpck_require__(5715);
@@ -42731,7 +42769,8 @@ var createRawJobs = function (context) {
   var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
   var deployJobs = deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context);
   var customJobs = getCustomJobs(context);
-  return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
+  var reportInventoryJob = (0, reportingJob_1.createInventoryReporitngJob)(context);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false), [reportInventoryJob], false);
 };
 
 var getFullJobName = function (name, componentName, env) {
@@ -43554,7 +43593,7 @@ __exportStar(__nccwpck_require__(3146), exports);
 
 exports.__esModule = true;
 exports.BASE_STAGES = void 0;
-exports.BASE_STAGES = ["setup", "test", "build", "deploy", "verify", "rollback", "stop", "inventory:gathering", "inventory:reporting"];
+exports.BASE_STAGES = ["setup", "test", "build", "deploy", "verify", "rollback", "stop", "reporting"];
 
 /***/ }),
 

package/dist/bundles/cli/index.js

@@ -349461,12 +349461,14 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 
 exports.__esModule = true;
-exports.createBuildJob = void 0;
+exports.createBuildJob = exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES = void 0;
 
 var lodash_1 = __nccwpck_require__(23255);
 
 var __1 = __nccwpck_require__(25355);
 
+var reportingJob_1 = __nccwpck_require__(89572);
+
 var utils_1 = __nccwpck_require__(37461);
 
 var yarn_1 = __nccwpck_require__(10464);
@@ -349475,6 +349477,8 @@ var constants_1 = __nccwpck_require__(11542);
 
 var getBuildInfo_1 = __nccwpck_require__(9197);
 
+exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES = reportingJob_1.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX + "_app.json";
+
 var createBuildJob = function (context, _a) {
   var _b, _c;
 
@@ -349492,7 +349496,7 @@ var createBuildJob = function (context, _a) {
     variables: __assign(__assign(__assign(__assign({}, constants_1.RUNNER_BUILD_RESOURCE_VARIABLES), variables !== null && variables !== void 0 ? variables : {}), context.environment.envVars), (_b = context.componentConfig.build.extraVars) !== null && _b !== void 0 ? _b : {}),
     script: __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, getBuildInfo_1.getBuildInfo)(context)), false), __read((0, yarn_1.ensureNodeVersion)(context)), false), ["cd ".concat(context.componentConfig.dir)], false), __read((_c = (0, utils_1.ensureArray)(script)) !== null && _c !== void 0 ? _c : []), false),
     artifacts: {
-      paths: [context.componentConfig.dir + "/__build_info.json"]
+      paths: [context.componentConfig.dir + "/__build_info.json", context.componentConfig.dir + "/" + exports.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES]
     }
   }, def);
 };
@@ -349846,7 +349850,7 @@ var constants_2 = __nccwpck_require__(69284);
 var yarn_1 = __nccwpck_require__(10464);
 
 var createNodeBuildJobs = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
 
   var buildConfig = context.componentConfig.build;
 
@@ -349855,17 +349859,19 @@ var createNodeBuildJobs = function (context) {
   }
 
   var yarnInstall = (0, yarn_1.getYarnInstall)(context);
+  var yarnReportDependenciesListCommand = ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) ? "npm ls --depth 0 --json | jq '.dependencies | to_entries | .[] | {artifact: .key, version: .value.version, type: \"npm\"}'" : "yarn info --json -A| jq '{version: .children.Version, artifact: .value, type: \"npm\" }'";
+  var yarnReportDependenciesCommand = yarnReportDependenciesListCommand + " | jq -n '. |= [inputs]' > " + createBuildJob_1.ARTIFACT_INVENTORY_BUILD_APP_DEPENDENCIES;
   var appBuildJob = buildConfig.buildCommand !== null ? (0, createBuildJob_1.createBuildJob)(context, {
     variables: __assign({}, constants_2.NODE_RUNNER_BUILD_VARIABLES),
     cache: __spreadArray(__spreadArray([], __read((0, cache_1.getNodeCache)(context)), false), __read((0, cache_1.getNextCache)(context)), false),
-    script: __spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_a = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _a !== void 0 ? _a : []), false),
+    script: __spreadArray(__spreadArray(__spreadArray([], __read(yarnInstall), false), __read((_b = (0, utils_1.ensureArray)(buildConfig.buildCommand)) !== null && _b !== void 0 ? _b : []), false), [yarnReportDependenciesCommand], false),
     artifacts: {
-      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_c = (_b = buildConfig.artifactsPaths) === null || _b === void 0 ? void 0 : _b.map(function (path) {
+      paths: __spreadArray([(0, path_1.join)(context.componentConfig.dir, "__build_info.json"), (0, path_1.join)(context.componentConfig.dir, "dist"), (0, path_1.join)(context.componentConfig.dir, ".next")], __read((_d = (_c = buildConfig.artifactsPaths) === null || _c === void 0 ? void 0 : _c.map(function (path) {
         return (0, path_1.join)(context.componentConfig.dir, path);
-      })) !== null && _c !== void 0 ? _c : []), false)
+      })) !== null && _d !== void 0 ? _d : []), false)
     }
   }) : null;
-  return __spreadArray(__spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
+  return __spreadArray(__spreadArray([], __read(appBuildJob ? [appBuildJob] : []), false), __read((0, docker_1.requiresDockerBuild)(context) ? [(0, docker_1.createDockerBuildJobDefault)(context, {
     script: [buildConfig.type === "node-static" || buildConfig.type === "storybook" ? "ensureNginxDockerfile" : "ensureNodeDockerfile"],
     cache: __spreadArray([], __read((0, cache_1.getYarnCache)(context, "pull")), false),
     variables: {
@@ -349877,18 +349883,12 @@ var createNodeBuildJobs = function (context) {
         prodOnly: true,
         noScripts: true
       }),
-      DOCKER_COPY_WORKSPACE_FILES: (_e = (_d = context.packageManagerInfo) === null || _d === void 0 ? void 0 : _d.pathsToCopyInDocker.map(function (dir) {
+      DOCKER_COPY_WORKSPACE_FILES: (_f = (_e = context.packageManagerInfo) === null || _e === void 0 ? void 0 : _e.pathsToCopyInDocker.map(function (dir) {
         return "COPY --chown=node:node ".concat(dir, " /app/").concat(dir);
-      })) === null || _e === void 0 ? void 0 : _e.join("\n")
+      })) === null || _f === void 0 ? void 0 : _f.join("\n")
     },
     needs: appBuildJob ? [constants_1.APP_BUILD_JOB_NAME] : []
-  })] : []), false), [{
-    envMode: "stagePerEnv",
-    stage: "build",
-    name: "Inventory report: deploy",
-    script: ["cd ".concat(context.componentConfig.dir), "yarn info --name-only --json "],
-    variables: {}
-  }], false);
+  })] : []), false);
 };
 
 exports.createNodeBuildJobs = createNodeBuildJobs;
@@ -350601,7 +350601,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "inventory-53a24d70" || 0;
+exports.PIPELINE_IMAGE_TAG = "inventory-2ef22dde" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352963,6 +352963,42 @@ __exportStar(__nccwpck_require__(90223), exports);
 
 /***/ }),
 
+/***/ 89572:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createInventoryReporitngJob = exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX = void 0;
+
+var lodash_1 = __nccwpck_require__(23255);
+
+exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX = "__inventory_dependencies";
+
+var createInventoryReporitngJob = function (context) {
+  var inventoryTemplate = {
+    appName: context.fullConfig.appName,
+    customerName: context.fullConfig.customerName,
+    componentName: context.componentName,
+    environment: (0, lodash_1.pick)(context.environment, ["shortName", "fullName", "host", "url"]),
+    build: context.componentConfig.build,
+    deploy: context.componentConfig.deploy
+  };
+  var printDepsCommand = "echo '".concat(JSON.stringify(inventoryTemplate), "' | jq --argjson dependencies \"$(echo ").concat(exports.INVENTORY_DEPENDENCIES_ARTIFACTS_PREFIX, " | jq -n '. |= [inputs]')\" '. + {dependencies: $dependencies}'");
+  return {
+    envMode: "jobPerEnv",
+    name: "inventory:reporting",
+    stage: "reporting",
+    variables: {},
+    script: [printDepsCommand]
+  };
+};
+
+exports.createInventoryReporitngJob = createInventoryReporitngJob;
+
+/***/ }),
+
 /***/ 78974:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -353465,6 +353501,8 @@ var context_1 = __nccwpck_require__(22041);
 
 var deploy_1 = __nccwpck_require__(90223);
 
+var reportingJob_1 = __nccwpck_require__(89572);
+
 var utils_1 = __nccwpck_require__(37461);
 
 var makeGitlabJob_1 = __nccwpck_require__(15715);
@@ -353501,7 +353539,8 @@ var createRawJobs = function (context) {
   var buildJobs = build_1.BUILD_TYPES[context.componentConfig.build.type].jobs(context);
   var deployJobs = deploy_1.DEPLOY_TYPES[context.componentConfig.deploy.type].jobs(context);
   var customJobs = getCustomJobs(context);
-  return __spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false);
+  var reportInventoryJob = (0, reportingJob_1.createInventoryReporitngJob)(context);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(buildJobs), false), __read(deployJobs), false), __read(customJobs), false), [reportInventoryJob], false);
 };
 
 var getFullJobName = function (name, componentName, env) {
@@ -354324,7 +354363,7 @@ __exportStar(__nccwpck_require__(63146), exports);
 
 exports.__esModule = true;
 exports.BASE_STAGES = void 0;
-exports.BASE_STAGES = ["setup", "test", "build", "deploy", "verify", "rollback", "stop", "inventory:gathering", "inventory:reporting"];
+exports.BASE_STAGES = ["setup", "test", "build", "deploy", "verify", "rollback", "stop", "reporting"];
 
 /***/ }),