@catladder/pipeline 1.169.0 → 1.170.1

package/examples/cloud-run-service-custom-vpc-connector.test.ts

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

package/examples/cloud-run-service-custom-vpc-connector.ts

@@ -0,0 +1,30 @@
+import type { Config } from "../src";
+
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    api: {
+      dir: "api",
+      build: {
+        type: "node",
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+
+        service: {
+          vpcConnector: "my-first-vpc-connector",
+          vpcEgress: "all-traffic",
+        },
+      },
+    },
+  },
+};
+
+export default config;
+
+export const information = {
+  title: "Cloud Run: Service with custom vpc settings",
+};

package/examples/cloud-run-service-custom-vpc.ts

@@ -15,7 +15,8 @@ const config: Config = {
         region: "europe-west6",
 
         service: {
-          vpcConnector: "my-first-vpc-connector",
+          network: "my-network",
+          subnet: "my-subnet",
           vpcEgress: "all-traffic",
         },
       },

package/examples/multiline-var.ts

@@ -4,20 +4,54 @@ const config: Config = {
   appName: "test-app",
   customerName: "pan",
   components: {
-    api: {
-      dir: "api",
+    app1: {
+      dir: "app1",
       build: {
         type: "node",
       },
       vars: {
         public: {
           foo: "foo-value",
-          multiline: `line1
-line2
-line3  
+          multiline: `app1 line1
+app1 line2
+app1 line3  
 
-single quote: '
-doouble quote: "
+the url of self: "\${ROOT_URL}"
+
+
+app1 single quote: '
+app1 doouble quote: "
+`,
+        },
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "asdf",
+        region: "asia-east1",
+      },
+    },
+    app2: {
+      dir: "app2",
+      build: {
+        type: "node",
+      },
+      vars: {
+        public: {
+          foo: "foo-value",
+          multiline: `app2 yeah
+app2 yeah2
+app2 yeah3  
+
+app2 single quote: '
+app2 doouble quote: "
+
+the url of self: "\${ROOT_URL}"
+the url of app1: "\${app1:ROOT_URL}"
+
+value from app1:
+-------
+\${multiline_from_app1}
+--------
 `,
         },
       },
@@ -27,20 +61,28 @@ doouble quote: "
         region: "asia-east1",
       },
     },
-    api2: {
-      dir: "api",
+    kube: {
+      dir: "kube",
       build: {
         type: "node",
       },
       vars: {
         public: {
-          multiline_from_api: "${api:multiline}",
-          multiline2: `yeah
-yeah2
-yeah3  
+          multiline_from_app1: "${app1:multiline}",
+          multiline: `kube yeah
+kube yeah2
+kube yeah3  
+
+kube single quote: '
+kube doouble quote: "
+
+the url of self: "\${ROOT_URL}"
+the url of app1: "\${app1:ROOT_URL}"
 
-single quote: '
-doouble quote: "
+value from app1:
+-------
+\${multiline_from_app1}
+--------
 `,
         },
       },

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.169.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

@@ -1,4 +1,4 @@
-import { BashExpression } from "./BashExpression";
+import { BashExpression, bashEscape } from "./BashExpression";
 
 // from https://github.com/dsblv/string-replace-async/blob/main/index.js
 // and adjusted a bit
@@ -11,13 +11,14 @@ export default async function replaceAsync(
   ) => Promise<string | BashExpression>,
 ) {
   const wasBashExpression = string instanceof BashExpression;
+
   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(
-      string.toString(),
+      string instanceof BashExpression ? string : bashEscape(string),
       searchValue,
       function (...args) {
         // eslint-disable-next-line prefer-spread
@@ -31,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(
-      string.toString(),
-      searchValue,
-      function () {
-        return resolvedValues.shift()?.toString() ?? "";
-      },
-    );
     if (wasBashExpression || containsBashExpression) {
       return new BashExpression(result);
     } else {

package/src/deploy/cloudRun/createJobs/cloudRunServices.ts

@@ -52,6 +52,8 @@ export const getServiceDeployScript = (
       timeout: customConfig?.timeout,
       "vpc-connector": customConfig?.vpcConnector,
       "vpc-egress": customConfig?.vpcEgress,
+      network: customConfig?.network,
+      subnet: customConfig?.subnet,
       "use-http2": customConfig?.http2,
       "allow-unauthenticated": customConfig?.allowUnauthenticated ?? true,
       ingress: customConfig?.ingress ?? "all",

package/src/deploy/types/googleCloudRun.ts

@@ -158,15 +158,23 @@ export type DeployConfigCloudRunService = {
    */
   executionEnvironment?: "gen2" | "gen1";
 
+  /* the vpc network, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--network  */
+  network?: string;
+
   /**
-   * vpc connector,
+   * vpc subnet to use, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--subnet
    */
-  vpcConnector?: string;
+  subnet?: string;
   /**
    * vpc egress, see https://cloud.google.com/sdk/gcloud/reference/run/deploy#--vpc-egress
    */
   vpcEgress?: "all-traffic" | "private-ranges-only";
 
+  /**
+   * vpc connector
+   */
+  vpcConnector?: string;
+
   /**
    * Use http2 end-to-end. See https://cloud.google.com/run/docs/configuring/http2
    *