@catladder/cli 0.0.0-main-e934b573 → 0.0.0-main-b9921f15

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-e934b573" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-b9921f15" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41356,7 +41356,7 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
     alreadyVisited = {};
   }
   return __awaiter(void 0, void 0, void 0, function () {
-    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, HOST_INTERNAL, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
     var _a, _b;
     var _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __generator(this, function (_m) {
@@ -41380,16 +41380,21 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
             predefinedVariables = {
               ENV_SHORT: "local",
               ROOT_URL: url,
+              HOST_INTERNAL: host,
+              ROOT_URL_INTERNAL: "http://" + host,
               PORT: port.toString()
             };
           } else {
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
-            host = (_e = (_d = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _d !== void 0 ? _d : additionalEnvVars.HOST_CANONICAL) !== null && _e !== void 0 ? _e : "unknown-host.example.com";
+            HOST_INTERNAL = (_d = additionalEnvVars.HOST_INTERNAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
+            host = (_e = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _e !== void 0 ? _e : HOST_INTERNAL;
             url = "https://".concat(host);
             predefinedVariables = __assign(__assign(__assign(__assign({}, basePredefinedVariables), config.components[componentName].build.type === "rails" ? {} : {
               HOST: host
             }), {
-              ROOT_URL: url
+              ROOT_URL: url,
+              HOST_CANONICAL: HOST_INTERNAL,
+              ROOT_URL_INTERNAL: "https://" + HOST_INTERNAL
             }), additionalEnvVars);
           }
           publicEnvVarsRaw = (_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.public) !== null && _g !== void 0 ? _g : {};
@@ -43023,6 +43028,7 @@ var utils_1 = __nccwpck_require__(463);
 var deployJob_1 = __nccwpck_require__(2256);
 var jobName_1 = __nccwpck_require__(7311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
+// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
   var _b, _c;
@@ -43081,7 +43087,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       env = ctx.env,
       componentName = ctx.componentName,
       deployConfigRaw = ctx.deployConfigRaw;
-    var HOST_CANONICAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
+    var HOST_INTERNAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
         name = _b[0],
@@ -43089,7 +43095,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
     return __assign(__assign({
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     }, getCloudSqlVariables(ctx)), jobTriggers);
   }
 };
@@ -43801,12 +43807,12 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) ||
     // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
     fullConfig.domainCanonical || "panter.cloud";
-    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+    var HOST_INTERNAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
     return {
       KUBE_NAMESPACE: KUBE_NAMESPACE,
       KUBE_APP_NAME: KUBE_APP_NAME,
       KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     };
   }
 };

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-e934b573" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-b9921f15" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -355895,7 +355895,7 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
     alreadyVisited = {};
   }
   return __awaiter(void 0, void 0, void 0, function () {
-    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
+    var environmentContext, envConfigRaw, deployConfigRaw, buildConfigRaw, envType, basePredefinedVariables, predefinedVariables, host, url, devLocalConfig, port, additionalEnvVars, HOST_INTERNAL, publicEnvVarsRaw, additionalSecretKeys, secretEnvVarKeys, secretEnvVars, legacyFromComponents, publicEnvVarsRawWithLegacyFromComponents, publicEnvVarsRawSanitized, envVarsRaw, envVars;
     var _a, _b;
     var _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __generator(this, function (_m) {
@@ -355919,16 +355919,21 @@ var getEnvironmentVariables = function (config, componentName, env, commitInfo,
             predefinedVariables = {
               ENV_SHORT: "local",
               ROOT_URL: url,
+              HOST_INTERNAL: host,
+              ROOT_URL_INTERNAL: "http://" + host,
               PORT: port.toString()
             };
           } else {
             additionalEnvVars = deployConfigRaw ? deploy_1.DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(environmentContext) : {};
-            host = (_e = (_d = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _d !== void 0 ? _d : additionalEnvVars.HOST_CANONICAL) !== null && _e !== void 0 ? _e : "unknown-host.example.com";
+            HOST_INTERNAL = (_d = additionalEnvVars.HOST_INTERNAL) !== null && _d !== void 0 ? _d : "unknown-host.example.com";
+            host = (_e = envConfigRaw === null || envConfigRaw === void 0 ? void 0 : envConfigRaw.host) !== null && _e !== void 0 ? _e : HOST_INTERNAL;
             url = "https://".concat(host);
             predefinedVariables = __assign(__assign(__assign(__assign({}, basePredefinedVariables), config.components[componentName].build.type === "rails" ? {} : {
               HOST: host
             }), {
-              ROOT_URL: url
+              ROOT_URL: url,
+              HOST_CANONICAL: HOST_INTERNAL,
+              ROOT_URL_INTERNAL: "https://" + HOST_INTERNAL
             }), additionalEnvVars);
           }
           publicEnvVarsRaw = (_g = (_f = envConfigRaw.vars) === null || _f === void 0 ? void 0 : _f.public) !== null && _g !== void 0 ? _g : {};
@@ -357562,6 +357567,7 @@ var utils_1 = __nccwpck_require__(70463);
 var deployJob_1 = __nccwpck_require__(82256);
 var jobName_1 = __nccwpck_require__(77311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
+// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
   var _b, _c;
@@ -357620,7 +357626,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       env = ctx.env,
       componentName = ctx.componentName,
       deployConfigRaw = ctx.deployConfigRaw;
-    var HOST_CANONICAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
+    var HOST_INTERNAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
         name = _b[0],
@@ -357628,7 +357634,7 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
       return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
     return __assign(__assign({
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     }, getCloudSqlVariables(ctx)), jobTriggers);
   }
 };
@@ -358340,12 +358346,12 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     var domainCanonical = deployConfigRaw && ((_b = deployConfigRaw.cluster) === null || _b === void 0 ? void 0 : _b.domainCanonical) ||
     // for convenience, we allow clusters to define a canonical domain, because a cluster has a fixed ip and you will usually have a domain pointing to that cluster
     fullConfig.domainCanonical || "panter.cloud";
-    var HOST_CANONICAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
+    var HOST_INTERNAL = "".concat(componentSlug, ".").concat(envInUrl, ".").concat(fullConfig.appName, ".").concat(fullConfig.customerName, ".").concat(domainCanonical); // default for kubernetes and rest
     return {
       KUBE_NAMESPACE: KUBE_NAMESPACE,
       KUBE_APP_NAME: KUBE_APP_NAME,
       KUBE_APP_NAME_PREFIX: KUBE_APP_NAME_PREFIX,
-      HOST_CANONICAL: HOST_CANONICAL
+      HOST_INTERNAL: HOST_INTERNAL
     };
   }
 };

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-main-e934b573",
+  "version": "0.0.0-main-b9921f15",
   "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-e934b573",
+    "@catladder/pipeline": "0.0.0-main-b9921f15",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",