@catladder/pipeline 2.2.1 → 2.2.3

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/context/getEnvironmentVariables.ts

@@ -40,7 +40,7 @@ type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 
 // we export so that we have later nice autocomplete
 export type PredefinedVariables = BasePredefinedVariables & {
-  HOSTNAME?: StringOrBashExpression;
+  HOSTNAME: StringOrBashExpression;
   ROOT_URL: StringOrBashExpression;
   HOSTNAME_INTERNAL: StringOrBashExpression;
   ROOT_URL_INTERNAL: StringOrBashExpression;
@@ -92,14 +92,9 @@ export const getEnvironmentVariables = async (
 
     predefinedVariables = {
       ...basePredefinedVariables,
-      // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-      ...(isStandaloneBuildConfig(buildConfigRaw) &&
-      buildConfigRaw.type === "rails"
-        ? {}
-        : { HOSTNAME: host }),
+      HOSTNAME: host,
       ROOT_URL: url,
       HOSTNAME_INTERNAL,
-
       ROOT_URL_INTERNAL: joinBashExpressions(["https://", HOSTNAME_INTERNAL]),
       ...additionalEnvVars,
     };
@@ -176,9 +171,6 @@ export const getEnvironmentVariables = async (
         (deployConfigRaw && deployConfigRaw.jobVars) || null,
       ),
     },
-
-    host,
-    url,
   };
 };
 

package/src/deploy/kubernetes/kubeValues.ts

@@ -26,7 +26,7 @@ const createAppConfig = (
 
   return mergeWithMergingArrays(
     {
-      host: context.environment.host,
+      host: context.environment.envVars.HOSTNAME,
       command: command ?? context.build.config.startCommand,
       livenessProbe: {
         httpGet: {

package/src/deploy/sbom.ts

@@ -16,7 +16,7 @@ export const getDependencyTrackUploadScript = (
     ? []
     : [
         "echo 'Uploading SBOM to Dependency Track'",
-        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" "${SBOM_FILE}" vex.json || true`,
+        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" upload "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" "${SBOM_FILE}" vex.json || true`,
       ];
 };
 
@@ -27,6 +27,6 @@ export const getDependencyTrackDeleteScript = (
     ? []
     : [
         "echo 'Disabling component in Dependency Track'",
-        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.url}" || true`,
+        `/dtrackuploader https://dep.panter.swiss/ "$DT_KEY_PROD" disable "${context.fullConfig.customerName}-${context.fullConfig.appName}/${context.name}" "${context.environment.envVars.ROOT_URL}" || true`,
       ];
 };

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -222,14 +222,14 @@ const addGitlabEnvironment = (
     return job;
   }
   const { env, name, environment } = context;
-  const { url, envType } = environment;
+  const { envVars, envType } = environment;
   const { on_stop, ...restEnvironment } = catladderJobEnvironment;
   // those can be dynamic, so we therefore have to do this: https://docs.gitlab.com/ee/ci/environments/#set-a-dynamic-environment-url
 
   const dotEnvFile = "gitlab_environment.env";
 
   const scriptToAdd = [
-    `echo "${GITLAB_ENVIRONMENT_URL_VARIABLE}=${url}" >> ${dotEnvFile}`,
+    `echo "${GITLAB_ENVIRONMENT_URL_VARIABLE}=${envVars.ROOT_URL}" >> ${dotEnvFile}`,
   ];
 
   // this is NOT a bashVariable since it NEEDS to be used as a string in gitlab

package/src/types/context.ts

@@ -28,9 +28,6 @@ export type EnvironmentEnvVars<
   secretEnvVarKeys: SecretEnvVar[];
 };
 export type EnvironmentEnvVarPart = {
-  host: StringOrBashExpression;
-  url: StringOrBashExpression;
-
   /**
    * vars that only are injected in certain jobs, but not elsewhere
    */
@@ -41,8 +38,6 @@ export type EnvironmentEnvVarPart = {
 } & EnvironmentEnvVars<PredefinedVariables>;
 // FIXME: align with EnvironmentContext
 export type Environment = {
-  host: StringOrBashExpression;
-  url: StringOrBashExpression;
   /**
    * the full name of the app. We use this as RELEASE_NAME in kubernetes and the service name in google cloud run
    */