@catladder/pipeline 1.170.0 → 1.170.1

package/examples/referencing-other-vars.test.ts

@@ -0,0 +1,11 @@
+import { createYamlLocalPipeline } from "./__utils__/helpers";
+import config from "./referencing-other-vars";
+
+/**
+ * This test is auto-generated.
+ * Modifications will be overwritten on every `yarn test` run!
+ */
+
+it("matches snapshot for referencing-other-vars local pipeline YAML", async () => {
+  expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
+});

package/examples/referencing-other-vars.ts

@@ -0,0 +1,83 @@
+import type { Config } from "../src";
+
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    app1: {
+      dir: "app1",
+      build: {
+        type: "node",
+      },
+      vars: {
+        secret: ["SECRET1"],
+        public: {
+          foo: "foo-value",
+          bar: "bar-value",
+          foo3: "from app3: ${app3:foo3}",
+          circle:
+            'this is from app3 that has reference to app1: "${app3:transitive}"', // not officially recommended, but may work in some cases
+        },
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "asdf",
+        region: "asia-east1",
+      },
+    },
+    app2: {
+      dir: "app2",
+      build: {
+        type: "node",
+      },
+      vars: {
+        secret: ["SECRET2"],
+        public: {
+          foo2: "foo-value-2",
+          referencingSecret: "secret1: ${app1:SECRET1}, secret2: ${SECRET2}",
+          foo1: "this is from app1: ${app1:foo}",
+          selfReference: "this is from self: ${foo2}",
+          selfReference2: "this is from self: ${foo1}",
+          app1Api: "${app1:ROOT_URL}/graphql",
+        },
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "asdf",
+        region: "asia-east1",
+      },
+    },
+    app3: {
+      dir: "kube",
+      build: {
+        type: "node",
+      },
+      vars: {
+        public: {
+          foo3: "foo-value-3",
+          foo2: "this is from app2: ${app2:foo2}",
+          transitive: "this is from app2: ${app2:foo1}",
+          transitiveWithSecret: "this is from app2: ${app2:referencingSecret}",
+          someJson:
+            '[{"name": "app1", "url": "${app1:ROOT_URL}"}, {"name": "app2", "url": "${app2:ROOT_URL}"}, {"name": "app3", "url": "${ROOT_URL}"}]',
+        },
+      },
+      deploy: {
+        type: "kubernetes",
+        cluster: {
+          name: "some-cluster-name",
+          region: "europe-west6",
+          projectId: "some-project-id",
+          type: "gcloud",
+          domainCanonical: "panter.cloud",
+        },
+      },
+    },
+  },
+};
+
+export default config;
+
+export const information = {
+  title: "Multiline Environment Variables",
+};

package/package.json

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

package/src/bash/BashExpression.ts

@@ -12,6 +12,16 @@ export class BashExpression {
     return this.value.toString();
   }
 
+  public replace(
+    searchValue: any,
+
+    replacer: (substring: string, ...args: any[]) => string,
+  ) {
+    return new BashExpression(
+      this.value.toString().replace(searchValue, replacer),
+    );
+  }
+
   /**
    *
    * @returns a bash expression to lowercase the string

package/src/bash/replaceAsync.ts

@@ -12,16 +12,13 @@ export default async function replaceAsync(
 ) {
   const wasBashExpression = string instanceof BashExpression;
 
-  const stringRepresentation = wasBashExpression
-    ? string.toString()
-    : bashEscape(string);
   try {
     // 1. Run fake pass of `replace`, collect values from `replacer` calls
     // 2. Resolve them with `Promise.all`
     // 3. Run `replace` with resolved values
     const values: Array<Promise<string | BashExpression>> = [];
     String.prototype.replace.call(
-      stringRepresentation,
+      string instanceof BashExpression ? string : bashEscape(string),
       searchValue,
       function (...args) {
         // eslint-disable-next-line prefer-spread
@@ -35,14 +32,12 @@ export default async function replaceAsync(
     const containsBashExpression = resolvedValues.some(
       (value) => value instanceof BashExpression,
     );
+    const result = (
+      string instanceof BashExpression ? string : bashEscape(string)
+    ).replace(searchValue, function () {
+      return resolvedValues.shift()?.toString() ?? "";
+    });
 
-    const result = String.prototype.replace.call(
-      stringRepresentation,
-      searchValue,
-      function () {
-        return resolvedValues.shift()?.toString() ?? "";
-      },
-    );
     if (wasBashExpression || containsBashExpression) {
       return new BashExpression(result);
     } else {