@catladder/pipeline 1.81.0 → 1.81.2

package/examples/__snapshots__/custom-build-job.ts.snap

@@ -39,13 +39,13 @@ exports[`matches snapshot 1`] = `
           "ENV_SHORT": "dev",
           "ENV_TYPE": "dev",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-dev-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-dev-www-undefined",
+          "HOST": "pan-test-app-dev-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-dev-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "2",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "4Gi",
           "KUBERNETES_MEMORY_REQUEST": "2Gi",
-          "ROOT_URL": "https://pan-test-app-dev-www-undefined",
+          "ROOT_URL": "https://pan-test-app-dev-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -113,7 +113,7 @@ exports[`matches snapshot 1`] = `
           "auto_stop_in": "4 weeks",
           "name": "dev/www",
           "on_stop": "www 🛑 Stop ⚠️ | dev ",
-          "url": "https://pan-test-app-dev-www-undefined",
+          "url": "https://pan-test-app-dev-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -184,19 +184,19 @@ exports[`matches snapshot 1`] = `
           "ENV_VARS": "ENV_SHORT: 'dev'
 APP_DIR: 'www'
 ENV_TYPE: 'dev'
-HOST: 'pan-test-app-dev-www-undefined'
-ROOT_URL: 'https://pan-test-app-dev-www-undefined'
-HOST_CANONICAL: 'pan-test-app-dev-www-undefined'
+HOST: 'pan-test-app-dev-www-unknown-host.example.com'
+ROOT_URL: 'https://pan-test-app-dev-www-unknown-host.example.com'
+HOST_CANONICAL: 'pan-test-app-dev-www-unknown-host.example.com'
 _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]'
 ",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_dev_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-dev-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-dev-www-undefined",
+          "HOST": "pan-test-app-dev-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-dev-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "2Gi",
           "KUBERNETES_MEMORY_REQUEST": "1Gi",
-          "ROOT_URL": "https://pan-test-app-dev-www-undefined",
+          "ROOT_URL": "https://pan-test-app-dev-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -204,7 +204,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
         "environment": {
           "action": "stop",
           "name": "dev/www",
-          "url": "https://pan-test-app-dev-www-undefined",
+          "url": "https://pan-test-app-dev-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -349,13 +349,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_SHORT": "review",
           "ENV_TYPE": "review",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_review_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-review-mr1234-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-review-mr1234-www-undefined",
+          "HOST": "pan-test-app-review-mr1234-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-review-mr1234-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "2",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "4Gi",
           "KUBERNETES_MEMORY_REQUEST": "2Gi",
-          "ROOT_URL": "https://pan-test-app-review-mr1234-www-undefined",
+          "ROOT_URL": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -423,7 +423,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "auto_stop_in": "2 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
-          "url": "https://pan-test-app-review-mr1234-www-undefined",
+          "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -494,19 +494,19 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_VARS": "ENV_SHORT: 'review'
 APP_DIR: 'www'
 ENV_TYPE: 'review'
-HOST: 'pan-test-app-review-mr1234-www-undefined'
-ROOT_URL: 'https://pan-test-app-review-mr1234-www-undefined'
-HOST_CANONICAL: 'pan-test-app-review-mr1234-www-undefined'
+HOST: 'pan-test-app-review-mr1234-www-unknown-host.example.com'
+ROOT_URL: 'https://pan-test-app-review-mr1234-www-unknown-host.example.com'
+HOST_CANONICAL: 'pan-test-app-review-mr1234-www-unknown-host.example.com'
 _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]'
 ",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_review_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-review-mr1234-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-review-mr1234-www-undefined",
+          "HOST": "pan-test-app-review-mr1234-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-review-mr1234-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "2Gi",
           "KUBERNETES_MEMORY_REQUEST": "1Gi",
-          "ROOT_URL": "https://pan-test-app-review-mr1234-www-undefined",
+          "ROOT_URL": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -514,7 +514,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
         "environment": {
           "action": "stop",
           "name": "review/some-commit/www",
-          "url": "https://pan-test-app-review-mr1234-www-undefined",
+          "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -659,13 +659,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_SHORT": "prod",
           "ENV_TYPE": "prod",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-prod-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-prod-www-undefined",
+          "HOST": "pan-test-app-prod-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-prod-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "2",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "4Gi",
           "KUBERNETES_MEMORY_REQUEST": "2Gi",
-          "ROOT_URL": "https://pan-test-app-prod-www-undefined",
+          "ROOT_URL": "https://pan-test-app-prod-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -703,13 +703,13 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_SHORT": "stage",
           "ENV_TYPE": "stage",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-stage-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-stage-www-undefined",
+          "HOST": "pan-test-app-stage-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-stage-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "2",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "4Gi",
           "KUBERNETES_MEMORY_REQUEST": "2Gi",
-          "ROOT_URL": "https://pan-test-app-stage-www-undefined",
+          "ROOT_URL": "https://pan-test-app-stage-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -830,7 +830,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "auto_stop_in": undefined,
           "name": "prod/www",
           "on_stop": "www 🛑 Stop ⚠️ | prod ",
-          "url": "https://pan-test-app-prod-www-undefined",
+          "url": "https://pan-test-app-prod-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -901,19 +901,19 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_VARS": "ENV_SHORT: 'prod'
 APP_DIR: 'www'
 ENV_TYPE: 'prod'
-HOST: 'pan-test-app-prod-www-undefined'
-ROOT_URL: 'https://pan-test-app-prod-www-undefined'
-HOST_CANONICAL: 'pan-test-app-prod-www-undefined'
+HOST: 'pan-test-app-prod-www-unknown-host.example.com'
+ROOT_URL: 'https://pan-test-app-prod-www-unknown-host.example.com'
+HOST_CANONICAL: 'pan-test-app-prod-www-unknown-host.example.com'
 _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]'
 ",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_prod_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-prod-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-prod-www-undefined",
+          "HOST": "pan-test-app-prod-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-prod-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "2Gi",
           "KUBERNETES_MEMORY_REQUEST": "1Gi",
-          "ROOT_URL": "https://pan-test-app-prod-www-undefined",
+          "ROOT_URL": "https://pan-test-app-prod-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -928,7 +928,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "auto_stop_in": undefined,
           "name": "stage/www",
           "on_stop": "www 🛑 Stop ⚠️ | stage ",
-          "url": "https://pan-test-app-stage-www-undefined",
+          "url": "https://pan-test-app-stage-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -999,19 +999,19 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
           "ENV_VARS": "ENV_SHORT: 'stage'
 APP_DIR: 'www'
 ENV_TYPE: 'stage'
-HOST: 'pan-test-app-stage-www-undefined'
-ROOT_URL: 'https://pan-test-app-stage-www-undefined'
-HOST_CANONICAL: 'pan-test-app-stage-www-undefined'
+HOST: 'pan-test-app-stage-www-unknown-host.example.com'
+ROOT_URL: 'https://pan-test-app-stage-www-unknown-host.example.com'
+HOST_CANONICAL: 'pan-test-app-stage-www-unknown-host.example.com'
 _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]'
 ",
           "GCLOUD_DEPLOY_credentialsKey": "$CL_stage_www_GCLOUD_DEPLOY_credentialsKey",
-          "HOST": "pan-test-app-stage-www-undefined",
-          "HOST_CANONICAL": "pan-test-app-stage-www-undefined",
+          "HOST": "pan-test-app-stage-www-unknown-host.example.com",
+          "HOST_CANONICAL": "pan-test-app-stage-www-unknown-host.example.com",
           "KUBERNETES_CPU_LIMIT": "1",
           "KUBERNETES_CPU_REQUEST": "0.5",
           "KUBERNETES_MEMORY_LIMIT": "2Gi",
           "KUBERNETES_MEMORY_REQUEST": "1Gi",
-          "ROOT_URL": "https://pan-test-app-stage-www-undefined",
+          "ROOT_URL": "https://pan-test-app-stage-www-unknown-host.example.com",
           "_ALL_ENV_VAR_KEYS": "["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CANONICAL","GCLOUD_DEPLOY_credentialsKey"]",
         },
       },
@@ -1019,7 +1019,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
         "environment": {
           "action": "stop",
           "name": "prod/www",
-          "url": "https://pan-test-app-prod-www-undefined",
+          "url": "https://pan-test-app-prod-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,
@@ -1062,7 +1062,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","HOST","ROOT_URL","HOST_CA
         "environment": {
           "action": "stop",
           "name": "stage/www",
-          "url": "https://pan-test-app-stage-www-undefined",
+          "url": "https://pan-test-app-stage-www-unknown-host.example.com",
         },
         "image": "path/to/docker/gcloud:the-version",
         "interruptible": true,

package/examples/cloud-run-with-sql.ts

@@ -49,7 +49,7 @@ const config: Config = {
       },
       vars: {
         public: {
-          API_URL: "${api:ROOT_URL}",
+          API_URL: "${api:ROOT_URL}/graphql",
         },
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.81.0",
+  "version": "1.81.2",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/context/__tests__/resolveReferences.test.ts

@@ -17,12 +17,9 @@ describe("resolveReferences", () => {
         FOO: "foo from frontend",
       },
     };
-    const result = await resolveReferences(
-      variables,
-      async (componentName, variableName) => {
-        return otherVariables[componentName]?.[variableName];
-      }
-    );
+    const result = await resolveReferences(variables, async (componentName) => {
+      return otherVariables[componentName];
+    });
 
     expect(result).toEqual({
       a: "hello world",
@@ -53,12 +50,9 @@ describe("resolveReferences", () => {
         FOO: "foo from api",
       },
     };
-    const result = await resolveReferences(
-      variables,
-      async (componentName, variableName) => {
-        return otherVariables[componentName]?.[variableName];
-      }
-    );
+    const result = await resolveReferences(variables, async (componentName) => {
+      return otherVariables[componentName];
+    });
 
     expect(result).toEqual({
       FOO: "hello from foo from api",
@@ -72,12 +66,9 @@ describe("resolveReferences", () => {
       b: "a not found value looks like this: '${api:FOO}'",
     };
     const otherVariables: Record<string, Record<string, string>> = {};
-    const result = await resolveReferences(
-      variables,
-      async (componentName, variableName) => {
-        return otherVariables[componentName]?.[variableName];
-      }
-    );
+    const result = await resolveReferences(variables, async (componentName) => {
+      return otherVariables[componentName];
+    });
 
     expect(result).toEqual({
       a: "hello world",
@@ -97,12 +88,9 @@ describe("resolveReferences", () => {
         FOO: "hi, ${api:FOO}",
       },
     };
-    const result = await resolveReferences(
-      variables,
-      async (componentName, variableName) => {
-        return otherVariables[componentName]?.[variableName] ?? "";
-      }
-    );
+    const result = await resolveReferences(variables, async (componentName) => {
+      return otherVariables[componentName];
+    });
 
     expect(result).toEqual({
       a: "value is hi, foo from api!",
@@ -121,12 +109,9 @@ describe("resolveReferences", () => {
         FOO: "frontend ${api:FOO}",
       },
     };
-    const result = await resolveReferences(
-      variables,
-      async (componentName, variableName) => {
-        return otherVariables[componentName]?.[variableName] ?? "";
-      }
-    );
+    const result = await resolveReferences(variables, async (componentName) => {
+      return otherVariables[componentName];
+    });
 
     expect(result).toEqual({
       a: "value is frontend api ${frontend:FOO}!",

package/src/context/getEnvironmentVariables.ts

@@ -53,7 +53,7 @@ export const getEnvironmentVariables = async (
   } else {
     const additionalEnvVars = deployConfigRaw
       ? DEPLOY_TYPES[deployConfigRaw.type].getAdditionalEnvVars(
-          environmentContext
+          environmentContext as never
         )
       : {};
 
@@ -66,7 +66,9 @@ export const getEnvironmentVariables = async (
     predefinedVariables = {
       ...basePredefinedVariables,
       // Rails before 6.1 (mis)uses the `HOST` environment variable to specify the IP to bind to
-      ...(config.components[componentName].build.type === "rails" ? {} : {HOST: host}),
+      ...(config.components[componentName].build.type === "rails"
+        ? {}
+        : { HOST: host }),
       ROOT_URL: url,
       ...additionalEnvVars,
     };
@@ -75,7 +77,7 @@ export const getEnvironmentVariables = async (
 
   const additionalSecretKeys = deployConfigRaw
     ? DEPLOY_TYPES[deployConfigRaw.type].additionalSecretKeys(
-        environmentContext
+        environmentContext as never
       )
     : [];
 
@@ -115,7 +117,7 @@ export const getEnvironmentVariables = async (
 
   const envVars = await resolveReferences(
     envVarsRaw,
-    async (otherComponentName, variableName, alreadyVisited) => {
+    async (otherComponentName, alreadyVisited) => {
       const { envVars: otherEnvVars } = await getEnvironmentVariables(
         config,
         otherComponentName,
@@ -123,7 +125,7 @@ export const getEnvironmentVariables = async (
         commitInfo,
         alreadyVisited
       );
-      return otherEnvVars[variableName];
+      return otherEnvVars;
     },
     alreadyVisited
   );

package/src/context/resolveReferences.ts

@@ -7,9 +7,8 @@ export const resolveReferences = async (
   vars: Record<string, string>,
   getOtherVariables?: (
     componentName: string,
-    variableName: string,
     alreadyVisited: Record<string, Record<string, boolean>>
-  ) => Promise<string | null>,
+  ) => Promise<Record<string, string | null>>,
   alreadyVisitedBase: Record<string, Record<string, boolean>> = {}
 ) => {
   const replaceSingleValue = async (
@@ -30,10 +29,8 @@ export const resolveReferences = async (
             },
           });
           const result = componentName
-            ? (await getOtherVariables?.(
-                componentName,
-                variableName,
-                newAlreadyVisited
+            ? (await getOtherVariables?.(componentName, newAlreadyVisited).then(
+                (r) => r?.[variableName]
               )) ?? null
             : vars[variableName]; // is self reference
 

package/src/deploy/cloudRun/index.ts

@@ -67,9 +67,9 @@ export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun"> = {
     const HOST_CANONICAL =
       fullName.toLowerCase() +
       "-" +
-      process.env[
+      (process.env[
         getSecretVarName(env, componentName, GCLOUD_RUN_CANONICAL_HOST_SUFFIX)
-      ];
+      ] ?? "unknown-host.example.com");
 
     const jobTriggers =
       deployConfigRaw && deployConfigRaw.jobs

package/src/deploy/types/googleCloudRun.ts

@@ -85,7 +85,7 @@ export type DeployConfigCloudRunService = {
   maxInstances?: number;
 
   /**
-   * set to true for workers
+   * set to true to allways allocate cpu, e.g. for workers. Careful that this is expensive!
    */
   noCpuThrottling?: true;