@highstate/restic 0.9.8 → 0.9.10

package/dist/repo/index.js

@@ -2,9 +2,10 @@ import "../chunk-G3PMV62Z.js";
 
 // src/repo/index.ts
 import { restic } from "@highstate/library";
-import { forUnit, getOrCreateSecret } from "@highstate/pulumi";
-import { generatePassword } from "@highstate/common";
-var { args, secrets, outputs } = forUnit(restic.repo);
+import { forUnit, toPromise } from "@highstate/pulumi";
+import { l34EndpointToString, parseL34Endpoint } from "@highstate/common";
+import { uniqueBy } from "remeda";
+var { args, inputs, secrets, outputs } = forUnit(restic.repo);
 var remoteName = secrets.rcloneConfig.apply((config) => {
   const remoteNames = Array.from(config.matchAll(/(?<=\[).+?(?=\])/g));
   if (remoteNames.length === 0) {
@@ -15,20 +16,30 @@ var remoteName = secrets.rcloneConfig.apply((config) => {
   }
   return remoteNames[0][0];
 });
-var password = getOrCreateSecret(secrets, "password", generatePassword);
-var basePath = args.basePath?.replace(/\/$/, "") ?? "backups";
+var { remoteL3Endpoints, remoteL4Endpoints } = await toPromise(inputs);
+var remoteEndpoints = uniqueBy(
+  [
+    //
+    ...args.remoteEndpoints.map(parseL34Endpoint),
+    ...remoteL3Endpoints,
+    ...remoteL4Endpoints
+  ],
+  l34EndpointToString
+);
 var repo_default = outputs({
   repo: {
-    password,
     type: "rclone",
+    pathPattern: args.pathPattern,
     rcloneConfig: secrets.rcloneConfig,
     remoteName,
-    remoteEndpoints: args.remoteDomains ?? [],
-    basePath
+    remoteEndpoints
   },
   $status: {
     remoteName,
-    basePath
+    remoteEndpoints: {
+      value: remoteEndpoints.map(l34EndpointToString),
+      complementaryTo: "remoteEndpoints"
+    }
   }
 });
 export {

package/dist/repo/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/repo/index.ts"],"sourcesContent":["import { restic } from \"@highstate/library\"\nimport { forUnit, getOrCreateSecret } from \"@highstate/pulumi\"\nimport { generatePassword } from \"@highstate/common\"\n\nconst { args, secrets, outputs } = forUnit(restic.repo)\n\nconst remoteName = secrets.rcloneConfig.apply(config => {\n  const remoteNames = Array.from(config.matchAll(/(?<=\\[).+?(?=\\])/g))\n\n  if (remoteNames.length === 0) {\n    throw new Error(\"No remotes found in rclone config\")\n  }\n\n  if (remoteNames.length > 1) {\n    throw new Error(\"Multiple remotes found in rclone config\")\n  }\n\n  return remoteNames[0][0]\n})\n\nconst password = getOrCreateSecret(secrets, \"password\", generatePassword)\nconst basePath = args.basePath?.replace(/\\/$/, \"\") ?? \"backups\"\n\nexport default outputs({\n  repo: {\n    password,\n    type: \"rclone\",\n    rcloneConfig: secrets.rcloneConfig,\n    remoteName,\n    remoteEndpoints: args.remoteDomains ?? [],\n    basePath,\n  },\n  $status: {\n    remoteName,\n    basePath,\n  },\n})\n"],"mappings":";;;AAAA,SAAS,cAAc;AACvB,SAAS,SAAS,yBAAyB;AAC3C,SAAS,wBAAwB;AAEjC,IAAM,EAAE,MAAM,SAAS,QAAQ,IAAI,QAAQ,OAAO,IAAI;AAEtD,IAAM,aAAa,QAAQ,aAAa,MAAM,YAAU;AACtD,QAAM,cAAc,MAAM,KAAK,OAAO,SAAS,mBAAmB,CAAC;AAEnE,MAAI,YAAY,WAAW,GAAG;AAC5B,UAAM,IAAI,MAAM,mCAAmC;AAAA,EACrD;AAEA,MAAI,YAAY,SAAS,GAAG;AAC1B,UAAM,IAAI,MAAM,yCAAyC;AAAA,EAC3D;AAEA,SAAO,YAAY,CAAC,EAAE,CAAC;AACzB,CAAC;AAED,IAAM,WAAW,kBAAkB,SAAS,YAAY,gBAAgB;AACxE,IAAM,WAAW,KAAK,UAAU,QAAQ,OAAO,EAAE,KAAK;AAEtD,IAAO,eAAQ,QAAQ;AAAA,EACrB,MAAM;AAAA,IACJ;AAAA,IACA,MAAM;AAAA,IACN,cAAc,QAAQ;AAAA,IACtB;AAAA,IACA,iBAAiB,KAAK,iBAAiB,CAAC;AAAA,IACxC;AAAA,EACF;AAAA,EACA,SAAS;AAAA,IACP;AAAA,IACA;AAAA,EACF;AACF,CAAC;","names":[]}
+{"version":3,"sources":["../../src/repo/index.ts"],"sourcesContent":["import { restic } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\nimport { l34EndpointToString, parseL34Endpoint } from \"@highstate/common\"\nimport { uniqueBy } from \"remeda\"\n\nconst { args, inputs, secrets, outputs } = forUnit(restic.repo)\n\nconst remoteName = secrets.rcloneConfig.apply(config => {\n  const remoteNames = Array.from(config.matchAll(/(?<=\\[).+?(?=\\])/g))\n\n  if (remoteNames.length === 0) {\n    throw new Error(\"No remotes found in rclone config\")\n  }\n\n  if (remoteNames.length > 1) {\n    throw new Error(\"Multiple remotes found in rclone config\")\n  }\n\n  return remoteNames[0][0]\n})\n\nconst { remoteL3Endpoints, remoteL4Endpoints } = await toPromise(inputs)\n\nconst remoteEndpoints = uniqueBy(\n  [\n    //\n    ...args.remoteEndpoints.map(parseL34Endpoint),\n    ...remoteL3Endpoints,\n    ...remoteL4Endpoints,\n  ],\n  l34EndpointToString,\n)\n\nexport default outputs({\n  repo: {\n    type: \"rclone\",\n    pathPattern: args.pathPattern,\n    rcloneConfig: secrets.rcloneConfig,\n    remoteName,\n    remoteEndpoints,\n  },\n\n  $status: {\n    remoteName,\n\n    remoteEndpoints: {\n      value: remoteEndpoints.map(l34EndpointToString),\n      complementaryTo: \"remoteEndpoints\",\n    },\n  },\n})\n"],"mappings":";;;AAAA,SAAS,cAAc;AACvB,SAAS,SAAS,iBAAiB;AACnC,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,gBAAgB;AAEzB,IAAM,EAAE,MAAM,QAAQ,SAAS,QAAQ,IAAI,QAAQ,OAAO,IAAI;AAE9D,IAAM,aAAa,QAAQ,aAAa,MAAM,YAAU;AACtD,QAAM,cAAc,MAAM,KAAK,OAAO,SAAS,mBAAmB,CAAC;AAEnE,MAAI,YAAY,WAAW,GAAG;AAC5B,UAAM,IAAI,MAAM,mCAAmC;AAAA,EACrD;AAEA,MAAI,YAAY,SAAS,GAAG;AAC1B,UAAM,IAAI,MAAM,yCAAyC;AAAA,EAC3D;AAEA,SAAO,YAAY,CAAC,EAAE,CAAC;AACzB,CAAC;AAED,IAAM,EAAE,mBAAmB,kBAAkB,IAAI,MAAM,UAAU,MAAM;AAEvE,IAAM,kBAAkB;AAAA,EACtB;AAAA;AAAA,IAEE,GAAG,KAAK,gBAAgB,IAAI,gBAAgB;AAAA,IAC5C,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AAAA,EACA;AACF;AAEA,IAAO,eAAQ,QAAQ;AAAA,EACrB,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,aAAa,KAAK;AAAA,IAClB,cAAc,QAAQ;AAAA,IACtB;AAAA,IACA;AAAA,EACF;AAAA,EAEA,SAAS;AAAA,IACP;AAAA,IAEA,iBAAiB;AAAA,MACf,OAAO,gBAAgB,IAAI,mBAAmB;AAAA,MAC9C,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF,CAAC;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "type": "module",
   "files": [
     "dist",
@@ -20,14 +20,15 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.8",
-    "@highstate/k8s": "^0.9.8",
-    "@highstate/library": "^0.9.8",
-    "@highstate/pulumi": "^0.9.8",
-    "@pulumi/kubernetes": "^4.18.0"
+    "@highstate/common": "^0.9.10",
+    "@highstate/k8s": "^0.9.10",
+    "@highstate/library": "^0.9.10",
+    "@highstate/pulumi": "^0.9.10",
+    "@pulumi/kubernetes": "^4.18.0",
+    "remeda": "^2.21.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.8"
+    "@highstate/cli": "^0.9.10"
   },
-  "gitHead": "036db4d9937ff30edf15f143482c5702e5b7a7fb"
+  "gitHead": "aacf8837fdf40f2bb2f83d4c11b35a358e26ec33"
 }

package/src/job-pair.ts

@@ -1,12 +1,12 @@
 import type { k8s, restic } from "@highstate/library"
 import type { InputL34Endpoint } from "@highstate/common"
-import { batch, core } from "@pulumi/kubernetes"
+import { batch } from "@pulumi/kubernetes"
 import {
   createScriptContainer,
   CronJob,
   Job,
-  mapMetadata,
   ScriptBundle,
+  Secret,
   type CommonArgs,
   type Container,
   type ScriptDistribution,
@@ -15,6 +15,7 @@ import {
 } from "@highstate/k8s"
 import {
   ComponentResource,
+  getUnitInstanceName,
   normalize,
   output,
   Output,
@@ -38,6 +39,11 @@ export type BackupJobPairArgs = CommonArgs & {
    */
   resticRepo: Input<restic.Repo>
 
+  /**
+   * The password used to encrypt the backups.
+   */
+  backupPassword: Input<string>
+
   /**
    * The extra script environment to pass to the backup and restore scripts.
    */
@@ -99,7 +105,7 @@ export class BackupJobPair extends ComponentResource {
   /**
    * The credentials used to access the repository and encrypt the backups.
    */
-  readonly credentials: Output<core.v1.Secret>
+  readonly credentials: Output<Secret>
 
   /**
    * The script bundle used by the backup and restore jobs.
@@ -124,13 +130,14 @@ export class BackupJobPair extends ComponentResource {
     super("highstate:restic:BackupJobPair", name, args, opts)
 
     this.credentials = output(args).apply(args => {
-      return new core.v1.Secret(
+      return Secret.create(
         `${name}-backup-credentials`,
         {
-          metadata: mapMetadata(args, `${name}-backup-credentials`),
+          namespace: args.namespace,
+          cluster: args.cluster,
 
           stringData: {
-            password: args.resticRepo.password,
+            password: args.backupPassword,
             "rclone.conf": args.resticRepo.rcloneConfig,
           },
         },
@@ -139,6 +146,11 @@ export class BackupJobPair extends ComponentResource {
     })
 
     const environment = output(args).apply(args => {
+      const repositoryPath = args.resticRepo.pathPattern
+        .replace(/\$clusterName/g, args.cluster.name)
+        .replace(/\$appName/g, name)
+        .replace(/\$unitName/g, getUnitInstanceName())
+
       return {
         alpine: {
           packages: ["rclone"],
@@ -165,7 +177,7 @@ export class BackupJobPair extends ComponentResource {
         },
 
         environment: {
-          RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${args.resticRepo.basePath}/${args.cluster.name}/${name}`,
+          RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${repositoryPath}`,
           RESTIC_PASSWORD_FILE: "/credentials/password",
           RESTIC_HOSTNAME: "default",
           RCLONE_CONFIG: "/credentials/rclone.conf",
@@ -224,6 +236,8 @@ export class BackupJobPair extends ComponentResource {
             main: "restore.sh",
             bundle: this.scriptBundle,
           }),
+
+          backoffLimit: 2,
         },
         { ...opts, parent: this },
       )
@@ -248,12 +262,7 @@ export class BackupJobPair extends ComponentResource {
 
           jobTemplate: {
             spec: {
-              backoffLimit: 1,
-              template: {
-                spec: {
-                  restartPolicy: "Never",
-                },
-              },
+              backoffLimit: 2,
             },
           },
         },

package/src/repo/index.ts

@@ -1,8 +1,9 @@
 import { restic } from "@highstate/library"
-import { forUnit, getOrCreateSecret } from "@highstate/pulumi"
-import { generatePassword } from "@highstate/common"
+import { forUnit, toPromise } from "@highstate/pulumi"
+import { l34EndpointToString, parseL34Endpoint } from "@highstate/common"
+import { uniqueBy } from "remeda"
 
-const { args, secrets, outputs } = forUnit(restic.repo)
+const { args, inputs, secrets, outputs } = forUnit(restic.repo)
 
 const remoteName = secrets.rcloneConfig.apply(config => {
   const remoteNames = Array.from(config.matchAll(/(?<=\[).+?(?=\])/g))
@@ -18,20 +19,33 @@ const remoteName = secrets.rcloneConfig.apply(config => {
   return remoteNames[0][0]
 })
 
-const password = getOrCreateSecret(secrets, "password", generatePassword)
-const basePath = args.basePath?.replace(/\/$/, "") ?? "backups"
+const { remoteL3Endpoints, remoteL4Endpoints } = await toPromise(inputs)
+
+const remoteEndpoints = uniqueBy(
+  [
+    //
+    ...args.remoteEndpoints.map(parseL34Endpoint),
+    ...remoteL3Endpoints,
+    ...remoteL4Endpoints,
+  ],
+  l34EndpointToString,
+)
 
 export default outputs({
   repo: {
-    password,
     type: "rclone",
+    pathPattern: args.pathPattern,
     rcloneConfig: secrets.rcloneConfig,
     remoteName,
-    remoteEndpoints: args.remoteDomains ?? [],
-    basePath,
+    remoteEndpoints,
   },
+
   $status: {
     remoteName,
-    basePath,
+
+    remoteEndpoints: {
+      value: remoteEndpoints.map(l34EndpointToString),
+      complementaryTo: "remoteEndpoints",
+    },
   },
 })