@highstate/common 0.9.16 → 0.9.19

package/dist/units/server-dns/index.js

@@ -1,4 +1,4 @@
-import { updateEndpointsWithFqdn, l3EndpointToString } from '../../chunk-HZBJ6LLS.js';
+import { updateEndpointsWithFqdn, l3EndpointToString } from '../../chunk-WDYIUWYZ.js';
 import { common } from '@highstate/library';
 import { forUnit } from '@highstate/pulumi';
 

package/dist/units/server-dns/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/units/server-dns/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAM,EAAA,MAAA,EAAQ,SAAY,GAAA,OAAA,CAAQ,OAAO,SAAS,CAAA;AAE1D,IAAM,EAAE,SAAU,EAAA,GAAI,MAAM,uBAAA;AAAA,EAC1B,OAAO,MAAO,CAAA,SAAA;AAAA,EACd,IAAK,CAAA,IAAA;AAAA,EACL,IAAK,CAAA,cAAA;AAAA,EACL,IAAK,CAAA,SAAA;AAAA,EACL,MAAO,CAAA;AACT,CAAA;AAEA,IAAO,qBAAQ,OAAQ,CAAA;AAAA,EACrB,MAAQ,EAAA,MAAA,CAAO,MAAO,CAAA,KAAA,CAAM,CAAW,MAAA,MAAA;AAAA,IACrC,GAAG,MAAA;AAAA,IACH;AAAA,GACA,CAAA,CAAA;AAAA,EAEF,SAAA;AAAA,EAEA,aAAe,EAAA;AAAA,IACb,SAAA,EAAW,SAAU,CAAA,GAAA,CAAI,kBAAkB;AAAA;AAE/C,CAAC","file":"index.js","sourcesContent":["import { common } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\nimport { l3EndpointToString, updateEndpointsWithFqdn } from \"../../shared\"\n\nconst { args, inputs, outputs } = forUnit(common.serverDns)\n\nconst { endpoints } = await updateEndpointsWithFqdn(\n  inputs.server.endpoints,\n  args.fqdn,\n  args.endpointFilter,\n  args.patchMode,\n  inputs.dnsProviders,\n)\n\nexport default outputs({\n  server: inputs.server.apply(server => ({\n    ...server,\n    endpoints,\n  })),\n\n  endpoints,\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n  },\n})\n"]}
+{"version":3,"sources":["../../../src/units/server-dns/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,OAAO,SAAS,CAAA;AAE1D,IAAM,EAAE,SAAA,EAAU,GAAI,MAAM,uBAAA;AAAA,EAC1B,OAAO,MAAA,CAAO,SAAA;AAAA,EACd,IAAA,CAAK,IAAA;AAAA,EACL,IAAA,CAAK,cAAA;AAAA,EACL,IAAA,CAAK,SAAA;AAAA,EACL,MAAA,CAAO;AACT,CAAA;AAEA,IAAO,qBAAQ,OAAA,CAAQ;AAAA,EACrB,MAAA,EAAQ,MAAA,CAAO,MAAA,CAAO,KAAA,CAAM,CAAA,MAAA,MAAW;AAAA,IACrC,GAAG,MAAA;AAAA,IACH;AAAA,GACF,CAAE,CAAA;AAAA,EAEF,SAAA;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,SAAA,EAAW,SAAA,CAAU,GAAA,CAAI,kBAAkB;AAAA;AAE/C,CAAC","file":"index.js","sourcesContent":["import { common } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\nimport { l3EndpointToString, updateEndpointsWithFqdn } from \"../../shared\"\n\nconst { args, inputs, outputs } = forUnit(common.serverDns)\n\nconst { endpoints } = await updateEndpointsWithFqdn(\n  inputs.server.endpoints,\n  args.fqdn,\n  args.endpointFilter,\n  args.patchMode,\n  inputs.dnsProviders,\n)\n\nexport default outputs({\n  server: inputs.server.apply(server => ({\n    ...server,\n    endpoints,\n  })),\n\n  endpoints,\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n  },\n})\n"]}

package/dist/units/server-patch/index.js

@@ -1,4 +1,4 @@
-import { updateEndpoints, l3EndpointToString } from '../../chunk-HZBJ6LLS.js';
+import { updateEndpoints, l3EndpointToString } from '../../chunk-WDYIUWYZ.js';
 import { common } from '@highstate/library';
 import { forUnit } from '@highstate/pulumi';
 

package/dist/units/server-patch/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/units/server-patch/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAM,EAAA,MAAA,EAAQ,SAAY,GAAA,OAAA,CAAQ,OAAO,WAAW,CAAA;AAE5D,IAAM,YAAY,MAAM,eAAA;AAAA,EACtB,OAAO,MAAO,CAAA,SAAA;AAAA,EACd,IAAK,CAAA,SAAA;AAAA,EACL,MAAO,CAAA,SAAA;AAAA,EACP,IAAK,CAAA;AACP,CAAA;AAEA,IAAO,uBAAQ,OAAQ,CAAA;AAAA,EACrB,MAAQ,EAAA,MAAA,CAAO,MAAO,CAAA,KAAA,CAAM,CAAW,MAAA,MAAA;AAAA,IACrC,GAAG,MAAA;AAAA,IACH;AAAA,GACA,CAAA,CAAA;AAAA,EAEF,SAAA;AAAA,EAEA,aAAe,EAAA;AAAA,IACb,SAAA,EAAW,SAAU,CAAA,GAAA,CAAI,kBAAkB;AAAA;AAE/C,CAAC","file":"index.js","sourcesContent":["import { common } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\nimport { l3EndpointToString, updateEndpoints } from \"../../shared\"\n\nconst { args, inputs, outputs } = forUnit(common.serverPatch)\n\nconst endpoints = await updateEndpoints(\n  inputs.server.endpoints,\n  args.endpoints,\n  inputs.endpoints,\n  args.endpointsPatchMode,\n)\n\nexport default outputs({\n  server: inputs.server.apply(server => ({\n    ...server,\n    endpoints,\n  })),\n\n  endpoints,\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n  },\n})\n"]}
+{"version":3,"sources":["../../../src/units/server-patch/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAA,EAAM,MAAA,EAAQ,SAAQ,GAAI,OAAA,CAAQ,OAAO,WAAW,CAAA;AAE5D,IAAM,YAAY,MAAM,eAAA;AAAA,EACtB,OAAO,MAAA,CAAO,SAAA;AAAA,EACd,IAAA,CAAK,SAAA;AAAA,EACL,MAAA,CAAO,SAAA;AAAA,EACP,IAAA,CAAK;AACP,CAAA;AAEA,IAAO,uBAAQ,OAAA,CAAQ;AAAA,EACrB,MAAA,EAAQ,MAAA,CAAO,MAAA,CAAO,KAAA,CAAM,CAAA,MAAA,MAAW;AAAA,IACrC,GAAG,MAAA;AAAA,IACH;AAAA,GACF,CAAE,CAAA;AAAA,EAEF,SAAA;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,SAAA,EAAW,SAAA,CAAU,GAAA,CAAI,kBAAkB;AAAA;AAE/C,CAAC","file":"index.js","sourcesContent":["import { common } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\nimport { l3EndpointToString, updateEndpoints } from \"../../shared\"\n\nconst { args, inputs, outputs } = forUnit(common.serverPatch)\n\nconst endpoints = await updateEndpoints(\n  inputs.server.endpoints,\n  args.endpoints,\n  inputs.endpoints,\n  args.endpointsPatchMode,\n)\n\nexport default outputs({\n  server: inputs.server.apply(server => ({\n    ...server,\n    endpoints,\n  })),\n\n  endpoints,\n\n  $statusFields: {\n    endpoints: endpoints.map(l3EndpointToString),\n  },\n})\n"]}

package/dist/units/ssh/key-pair/index.js

@@ -1,12 +1,12 @@
-import { generatePrivateKey, privateKeyToKeyPair } from '../../../chunk-HZBJ6LLS.js';
+import { generateSshPrivateKey, sshPrivateKeyToKeyPair } from '../../../chunk-WDYIUWYZ.js';
 import { ssh } from '@highstate/library';
-import { forUnit, getOrCreateSecret } from '@highstate/pulumi';
+import { forUnit } from '@highstate/pulumi';
 
-var { name, secrets, outputs } = forUnit(ssh.keyPair);
-var privateKey = getOrCreateSecret(secrets, "privateKey", generatePrivateKey);
-var keyPair = privateKeyToKeyPair(privateKey);
+var { name, getSecret, outputs } = forUnit(ssh.keyPair);
+var privateKey = getSecret("privateKey", generateSshPrivateKey);
+var keyPair = sshPrivateKeyToKeyPair(privateKey);
 var key_pair_default = outputs({
-  keyPair: privateKeyToKeyPair(privateKey),
+  keyPair,
   publicKeyFile: {
     meta: {
       name: `${name}.pub`,

package/dist/units/ssh/key-pair/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/units/ssh/key-pair/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAM,EAAA,OAAA,EAAS,SAAY,GAAA,OAAA,CAAQ,IAAI,OAAO,CAAA;AAEtD,IAAM,UAAa,GAAA,iBAAA,CAAkB,OAAS,EAAA,YAAA,EAAc,kBAAkB,CAAA;AAC9E,IAAM,OAAA,GAAU,oBAAoB,UAAU,CAAA;AAE9C,IAAO,mBAAQ,OAAQ,CAAA;AAAA,EACrB,OAAA,EAAS,oBAAoB,UAAU,CAAA;AAAA,EACvC,aAAe,EAAA;AAAA,IACb,IAAM,EAAA;AAAA,MACJ,IAAA,EAAM,GAAG,IAAI,CAAA,IAAA,CAAA;AAAA,MACb,IAAM,EAAA;AAAA,KACR;AAAA,IACA,OAAS,EAAA;AAAA,MACP,IAAM,EAAA,UAAA;AAAA,MACN,OAAO,OAAQ,CAAA;AAAA;AACjB,GACF;AAAA,EACA,aAAe,EAAA;AAAA,IACb,aAAa,OAAQ,CAAA,WAAA;AAAA,IACrB,WAAW,OAAQ,CAAA;AAAA;AAEvB,CAAC","file":"index.js","sourcesContent":["import { ssh } from \"@highstate/library\"\nimport { forUnit, getOrCreateSecret } from \"@highstate/pulumi\"\nimport { generatePrivateKey, privateKeyToKeyPair } from \"../../../shared\"\n\nconst { name, secrets, outputs } = forUnit(ssh.keyPair)\n\nconst privateKey = getOrCreateSecret(secrets, \"privateKey\", generatePrivateKey)\nconst keyPair = privateKeyToKeyPair(privateKey)\n\nexport default outputs({\n  keyPair: privateKeyToKeyPair(privateKey),\n  publicKeyFile: {\n    meta: {\n      name: `${name}.pub`,\n      mode: 0o644,\n    },\n    content: {\n      type: \"embedded\",\n      value: keyPair.publicKey,\n    },\n  },\n  $statusFields: {\n    fingerprint: keyPair.fingerprint,\n    publicKey: keyPair.publicKey,\n  },\n})\n"]}
+{"version":3,"sources":["../../../../src/units/ssh/key-pair/index.ts"],"names":[],"mappings":";;;;AAIA,IAAM,EAAE,IAAA,EAAM,SAAA,EAAW,SAAQ,GAAI,OAAA,CAAQ,IAAI,OAAO,CAAA;AAExD,IAAM,UAAA,GAAa,SAAA,CAAU,YAAA,EAAc,qBAAqB,CAAA;AAChE,IAAM,OAAA,GAAU,uBAAuB,UAAU,CAAA;AAEjD,IAAO,mBAAQ,OAAA,CAAQ;AAAA,EACrB,OAAA;AAAA,EACA,aAAA,EAAe;AAAA,IACb,IAAA,EAAM;AAAA,MACJ,IAAA,EAAM,GAAG,IAAI,CAAA,IAAA,CAAA;AAAA,MACb,IAAA,EAAM;AAAA,KACR;AAAA,IACA,OAAA,EAAS;AAAA,MACP,IAAA,EAAM,UAAA;AAAA,MACN,OAAO,OAAA,CAAQ;AAAA;AACjB,GACF;AAAA,EACA,aAAA,EAAe;AAAA,IACb,aAAa,OAAA,CAAQ,WAAA;AAAA,IACrB,WAAW,OAAA,CAAQ;AAAA;AAEvB,CAAC","file":"index.js","sourcesContent":["import { ssh } from \"@highstate/library\"\nimport { forUnit } from \"@highstate/pulumi\"\nimport { generateSshPrivateKey, sshPrivateKeyToKeyPair } from \"../../../shared\"\n\nconst { name, getSecret, outputs } = forUnit(ssh.keyPair)\n\nconst privateKey = getSecret(\"privateKey\", generateSshPrivateKey)\nconst keyPair = sshPrivateKeyToKeyPair(privateKey)\n\nexport default outputs({\n  keyPair,\n  publicKeyFile: {\n    meta: {\n      name: `${name}.pub`,\n      mode: 0o644,\n    },\n    content: {\n      type: \"embedded\",\n      value: keyPair.publicKey,\n    },\n  },\n  $statusFields: {\n    fingerprint: keyPair.fingerprint,\n    publicKey: keyPair.publicKey,\n  },\n})\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/common",
-  "version": "0.9.16",
+  "version": "0.9.19",
   "type": "module",
   "files": [
     "dist",
@@ -11,6 +11,54 @@
       ".": {
         "mode": "manual",
         "version": "1"
+      },
+      "./units/access-point": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/dns/record-set": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/network/l3-endpoint": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/network/l4-endpoint": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/existing-server": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/ssh/key-pair": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/script": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/server-dns": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/server-patch": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/databases/existing-mariadb": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/databases/existing-postgresql": {
+        "mode": "manual",
+        "version": "1"
+      },
+      "./units/databases/existing-mongodb": {
+        "mode": "manual",
+        "version": "1"
       }
     }
   },
@@ -19,6 +67,7 @@
       "types": "./src/index.ts",
       "default": "./dist/index.js"
     },
+    "./units/access-point": "./dist/units/access-point/index.js",
     "./units/dns/record-set": "./dist/units/dns/record-set/index.js",
     "./units/network/l3-endpoint": "./dist/units/network/l3-endpoint/index.js",
     "./units/network/l4-endpoint": "./dist/units/network/l4-endpoint/index.js",
@@ -26,7 +75,10 @@
     "./units/ssh/key-pair": "./dist/units/ssh/key-pair/index.js",
     "./units/script": "./dist/units/script/index.js",
     "./units/server-dns": "./dist/units/server-dns/index.js",
-    "./units/server-patch": "./dist/units/server-patch/index.js"
+    "./units/server-patch": "./dist/units/server-patch/index.js",
+    "./units/databases/existing-mariadb": "./dist/units/databases/existing-mariadb/index.js",
+    "./units/databases/existing-postgresql": "./dist/units/databases/existing-postgresql/index.js",
+    "./units/databases/existing-mongodb": "./dist/units/databases/existing-mongodb/index.js"
   },
   "publishConfig": {
     "access": "public"
@@ -36,9 +88,9 @@
     "update-images": "../../scripts/update-images.sh ./assets/images.json"
   },
   "dependencies": {
-    "@highstate/contract": "^0.9.16",
-    "@highstate/library": "^0.9.16",
-    "@highstate/pulumi": "^0.9.16",
+    "@highstate/contract": "^0.9.19",
+    "@highstate/library": "^0.9.19",
+    "@highstate/pulumi": "^0.9.19",
     "@noble/hashes": "^1.7.1",
     "@pulumi/command": "^1.0.2",
     "micro-key-producer": "^0.7.3",
@@ -48,9 +100,10 @@
     "unzipper": "^0.12.3"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.16",
+    "@highstate/cli": "^0.9.19",
     "@types/tar": "^6.1.13",
-    "@types/unzipper": "^0.10.11"
+    "@types/unzipper": "^0.10.11",
+    "type-fest": "^4.41.0"
   },
-  "gitHead": "458d6f1f9f6d4aec0ba75a2b2c4c01408cb9c8df"
+  "gitHead": "e77d292335556c6e5b6275acda1a3d1609d786a1"
 }

package/src/shared/access-point.ts

@@ -0,0 +1,110 @@
+import type { common } from "@highstate/library"
+import type { Except } from "type-fest"
+import {
+  ComponentResource,
+  type ComponentResourceOptions,
+  type Input,
+  type Output,
+  output,
+  toPromise,
+} from "@highstate/pulumi"
+import { DnsRecordSet } from "./dns"
+import { GatewayRoute, type GatewayRouteSpec } from "./gateway"
+import { TlsCertificate } from "./tls"
+
+export type AccessPointRouteArgs = Except<GatewayRouteSpec, "nativeData"> & {
+  /**
+   * The access point to use to expose the route.
+   */
+  accessPoint: Input<common.AccessPoint>
+
+  /**
+   * The native data to pass to the gateway route implementation.
+   */
+  gatewayNativeData?: unknown
+
+  /**
+   * The native data to pass to the tls ceertificate implementation.
+   */
+  tlsCertificateNativeData?: unknown
+}
+
+export class AccessPointRoute extends ComponentResource {
+  /**
+   * The created gateway route.
+   */
+  readonly route: GatewayRoute
+
+  /**
+   * The DNS record set created for the route.
+   *
+   * May be shared between multiple routes with the same FQDN.
+   */
+  readonly dnsRecordSet?: Output<DnsRecordSet | undefined>
+
+  /**
+   * The TLS certificate created for the route.
+   *
+   * May be shared between multiple routes with the same FQDN.
+   */
+  readonly tlsCertificate?: Output<TlsCertificate | undefined>
+
+  constructor(name: string, args: AccessPointRouteArgs, opts?: ComponentResourceOptions) {
+    super("highstate:common:AccessPointRoute", name, args, opts)
+
+    // 1. create TLS certificate if the route is HTTPS and the access point has TLS issuers
+    if (args.fqdn && args.type === "http" && !args.insecure) {
+      this.tlsCertificate = output(args.accessPoint).apply(accessPoint => {
+        if (accessPoint.tlsIssuers.length === 0) {
+          return undefined
+        }
+
+        return TlsCertificate.createOnce(
+          name,
+          {
+            issuers: accessPoint.tlsIssuers,
+            dnsNames: args.fqdn ? [args.fqdn] : [],
+            nativeData: args.tlsCertificateNativeData,
+          },
+          { ...opts, parent: this },
+        )
+      })
+    }
+
+    // 2. create the route and resolve the gateway endpoints
+    this.route = new GatewayRoute(
+      name,
+      {
+        ...args,
+        gateway: output(args.accessPoint).gateway,
+        tlsCertificate: this.tlsCertificate,
+        nativeData: args.gatewayNativeData,
+      },
+      { ...opts, parent: this },
+    )
+
+    // 3. register DNS records if FQDN is provided and the access point has DNS providers
+    if (args.fqdn) {
+      this.dnsRecordSet = output(args.accessPoint).apply(async accessPoint => {
+        if (accessPoint.dnsProviders.length === 0) {
+          return undefined
+        }
+
+        const fqdn = await toPromise(args.fqdn)
+        if (!fqdn) {
+          return undefined
+        }
+
+        return DnsRecordSet.createOnce(
+          fqdn,
+          {
+            providers: output(args.accessPoint).dnsProviders,
+            values: this.route.endpoints,
+            waitAt: "local",
+          },
+          { ...opts, parent: this },
+        )
+      })
+    }
+  }
+}