@catladder/cli 0.0.0-main-a854e86f → 0.0.0-main-8f65e195

package/dist/bundles/catenv/index.js

@@ -40925,7 +40925,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-a854e86f" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-8f65e195" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -42782,6 +42782,14 @@ var cleanup_1 = __nccwpck_require__(964);
 var setGoogleProjectNumberScript = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
+var makeLabelString = function (obj) {
+  return Object.entries(obj).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "".concat(key, "=").concat(value);
+  }).join(",");
+};
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -42793,12 +42801,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     throw new Error("deploy config is wrong");
   }
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    return "".concat(key, "=").concat(value);
-  }).join(",");
   var commonArgs = {
     project: deployConfig.projectId,
     region: deployConfig.region
@@ -42806,8 +42808,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var commonDeployArgs = __assign(__assign({
     image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
-    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
-    labels: labelsString
+    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined
   });
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var getFullJobName = function (name) {
@@ -42842,10 +42843,14 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
+    var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
     var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
       // command as empty string resets it to default (uses the image's entrypoint)
       command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-service-name": fullServiceName
+      })),
       "env-vars-file": "____envvars.yaml",
       "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
       "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
@@ -42855,7 +42860,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
       ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
       "cpu-boost": true
     }));
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
+    return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
@@ -42865,6 +42870,9 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
       command: '"' + commandArray.join(",") + '"'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-job-name": jobName
+      })),
       image: job.image || commonDeployArgs.image,
       memory: job.memory || "512Mi",
       "task-timeout": job.timeout || "10m"

package/dist/bundles/cli/index.js

@@ -355464,7 +355464,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-a854e86f" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-8f65e195" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -357321,6 +357321,14 @@ var cleanup_1 = __nccwpck_require__(10964);
 var setGoogleProjectNumberScript = function (deployConfig) {
   return ["export GCLOUD_PROJECT_NUMBER=$(gcloud projects describe ".concat(deployConfig.projectId, " --format=\"value(projectNumber)\")"), "echo \"GCLOUD_PROJECT_NUMBER: $GCLOUD_PROJECT_NUMBER\""];
 };
+var makeLabelString = function (obj) {
+  return Object.entries(obj).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "".concat(key, "=").concat(value);
+  }).join(",");
+};
 var createGoogleCloudRunDeployJobs = function (context) {
   var _a, _b, _c;
   var deployConfig = context.componentConfig.deploy;
@@ -357332,12 +357340,6 @@ var createGoogleCloudRunDeployJobs = function (context) {
     throw new Error("deploy config is wrong");
   }
   var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, _1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  var labelsString = Object.entries((0, getLabels_1.getLabels)(context)).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    return "".concat(key, "=").concat(value);
-  }).join(",");
   var commonArgs = {
     project: deployConfig.projectId,
     region: deployConfig.region
@@ -357345,8 +357347,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var commonDeployArgs = __assign(__assign({
     image: (0, artifactsRegistry_1.getArtifactsRegistryImage)(context)
   }, commonArgs), {
-    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined,
-    labels: labelsString
+    "set-cloudsql-instances": deployConfig.cloudSql ? deployConfig.cloudSql.instanceConnectionName : undefined
   });
   var serviceName = (0, getServiceName_1.getServiceName)(context);
   var getFullJobName = function (name) {
@@ -357381,10 +357382,14 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var customConfig = service !== true ? service : undefined;
     var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
     var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
+    var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
     var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
       // command as empty string resets it to default (uses the image's entrypoint)
       command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-service-name": fullServiceName
+      })),
       "env-vars-file": "____envvars.yaml",
       "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
       "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
@@ -357394,7 +357399,7 @@ var createGoogleCloudRunDeployJobs = function (context) {
       ingress: (_e = customConfig === null || customConfig === void 0 ? void 0 : customConfig.ingress) !== null && _e !== void 0 ? _e : "all",
       "cpu-boost": true
     }));
-    return "gcloud run deploy ".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "", " ").concat(argsString);
+    return "gcloud run deploy ".concat(fullServiceName, " ").concat(argsString);
   };
   var getJobCreateScriptsForJob = function (jobName, job) {
     // due to some oversight from google, jobs create does not accept `--env-vars-file` 🤦
@@ -357404,6 +357409,9 @@ var createGoogleCloudRunDeployJobs = function (context) {
     var commonDeployArgsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
       command: '"' + commandArray.join(",") + '"'
     }, commonDeployArgs), {
+      labels: makeLabelString(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
+        "cloud-run-job-name": jobName
+      })),
       image: job.image || commonDeployArgs.image,
       memory: job.memory || "512Mi",
       "task-timeout": job.timeout || "10m"

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-main-a854e86f",
+  "version": "0.0.0-main-8f65e195",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -73,7 +73,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-main-a854e86f",
+    "@catladder/pipeline": "0.0.0-main-8f65e195",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",