@highstate/restic 0.9.14 → 0.9.16

package/dist/repo/index.js

@@ -1,10 +1,9 @@
-import "../chunk-G3PMV62Z.js";
+import '../chunk-G3PMV62Z.js';
+import { restic } from '@highstate/library';
+import { forUnit, toPromise } from '@highstate/pulumi';
+import { parseL34Endpoint, l34EndpointToString } from '@highstate/common';
+import { uniqueBy } from 'remeda';
 
-// src/repo/index.ts
-import { restic } from "@highstate/library";
-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));
@@ -34,7 +33,7 @@ var repo_default = outputs({
     remoteName,
     remoteEndpoints
   },
-  $status: {
+  $statusFields: {
     remoteName,
     remoteEndpoints: {
       value: remoteEndpoints.map(l34EndpointToString),
@@ -42,7 +41,7 @@ var repo_default = outputs({
     }
   }
 });
-export {
-  repo_default as default
-};
+
+export { repo_default as default };
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/repo/index.js.map

@@ -1 +1 @@
-{"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":[]}
+{"version":3,"sources":["../../src/repo/index.ts"],"names":[],"mappings":";;;;;;AAKA,IAAM,EAAE,MAAM,MAAQ,EAAA,OAAA,EAAS,SAAY,GAAA,OAAA,CAAQ,OAAO,IAAI,CAAA;AAE9D,IAAM,UAAa,GAAA,OAAA,CAAQ,YAAa,CAAA,KAAA,CAAM,CAAU,MAAA,KAAA;AACtD,EAAA,MAAM,cAAc,KAAM,CAAA,IAAA,CAAK,MAAO,CAAA,QAAA,CAAS,mBAAmB,CAAC,CAAA;AAEnE,EAAI,IAAA,WAAA,CAAY,WAAW,CAAG,EAAA;AAC5B,IAAM,MAAA,IAAI,MAAM,mCAAmC,CAAA;AAAA;AAGrD,EAAI,IAAA,WAAA,CAAY,SAAS,CAAG,EAAA;AAC1B,IAAM,MAAA,IAAI,MAAM,yCAAyC,CAAA;AAAA;AAG3D,EAAO,OAAA,WAAA,CAAY,CAAC,CAAA,CAAE,CAAC,CAAA;AACzB,CAAC,CAAA;AAED,IAAM,EAAE,iBAAmB,EAAA,iBAAA,EAAsB,GAAA,MAAM,UAAU,MAAM,CAAA;AAEvE,IAAM,eAAkB,GAAA,QAAA;AAAA,EACtB;AAAA;AAAA,IAEE,GAAG,IAAA,CAAK,eAAgB,CAAA,GAAA,CAAI,gBAAgB,CAAA;AAAA,IAC5C,GAAG,iBAAA;AAAA,IACH,GAAG;AAAA,GACL;AAAA,EACA;AACF,CAAA;AAEA,IAAO,eAAQ,OAAQ,CAAA;AAAA,EACrB,IAAM,EAAA;AAAA,IACJ,IAAM,EAAA,QAAA;AAAA,IACN,aAAa,IAAK,CAAA,WAAA;AAAA,IAClB,cAAc,OAAQ,CAAA,YAAA;AAAA,IACtB,UAAA;AAAA,IACA;AAAA,GACF;AAAA,EAEA,aAAe,EAAA;AAAA,IACb,UAAA;AAAA,IAEA,eAAiB,EAAA;AAAA,MACf,KAAA,EAAO,eAAgB,CAAA,GAAA,CAAI,mBAAmB,CAAA;AAAA,MAC9C,eAAiB,EAAA;AAAA;AACnB;AAEJ,CAAC","file":"index.js","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  $statusFields: {\n    remoteName,\n\n    remoteEndpoints: {\n      value: remoteEndpoints.map(l34EndpointToString),\n      complementaryTo: \"remoteEndpoints\",\n    },\n  },\n})\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.14",
+  "version": "0.9.16",
   "type": "module",
   "files": [
     "dist",
@@ -17,18 +17,19 @@
     "access": "public"
   },
   "scripts": {
-    "build": "highstate build"
+    "build": "highstate build",
+    "update-images": "../../scripts/update-images.sh ./assets/images.json"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.14",
-    "@highstate/k8s": "^0.9.14",
-    "@highstate/library": "^0.9.14",
-    "@highstate/pulumi": "^0.9.14",
+    "@highstate/common": "^0.9.16",
+    "@highstate/k8s": "^0.9.16",
+    "@highstate/library": "^0.9.16",
+    "@highstate/pulumi": "^0.9.16",
     "@pulumi/kubernetes": "^4.18.0",
     "remeda": "^2.21.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.14"
+    "@highstate/cli": "^0.9.16"
   },
-  "gitHead": "8b5d1079961cc5bf9cf8ea3c10f7313384e3a2ff"
+  "gitHead": "458d6f1f9f6d4aec0ba75a2b2c4c01408cb9c8df"
 }

package/src/job-pair.ts

@@ -23,10 +23,12 @@ import {
   type ComponentResourceOptions,
   type Input,
   type InputArray,
+  type InstanceTerminal,
   type InstanceTrigger,
   type InstanceTriggerInvocation,
 } from "@highstate/pulumi"
 import { text } from "@highstate/contract"
+import * as images from "../assets/images.json"
 import { backupEnvironment } from "./scripts"
 
 export type BackupJobPairArgs = CommonArgs & {
@@ -38,7 +40,7 @@ export type BackupJobPairArgs = CommonArgs & {
   /**
    * The repository to backup/restore to/from.
    */
-  resticRepo: Input<restic.Repo>
+  resticRepo: Input<restic.Repository>
 
   /**
    * The password used to encrypt the backups.
@@ -123,6 +125,11 @@ export class BackupJobPair extends ComponentResource {
    */
   readonly backupJob: Output<CronJob>
 
+  /**
+   * The full name of the Restic repository.
+   */
+  readonly resticRepoPath: Output<string>
+
   constructor(
     private readonly name: string,
     private readonly args: BackupJobPairArgs,
@@ -146,65 +153,71 @@ export class BackupJobPair extends ComponentResource {
       )
     })
 
-    const environment = output(args).apply(args => {
-      const repositoryPath = args.resticRepo.pathPattern
+    this.resticRepoPath = output(args).apply(args => {
+      const relativePath = args.resticRepo.pathPattern
         .replace(/\$clusterName/g, args.cluster.name)
         .replace(/\$appName/g, name)
         .replace(/\$unitName/g, getUnitInstanceName())
 
-      return {
-        alpine: {
-          packages: ["rclone"],
-        },
+      return `rclone:${args.resticRepo.remoteName}:${relativePath}`
+    })
+
+    const environment = output({ args, repoPath: this.resticRepoPath }).apply(
+      ({ args, repoPath }) => {
+        return {
+          alpine: {
+            packages: ["rclone"],
+          },
 
-        ubuntu: {
-          preInstallPackages: ["curl", "unzip"],
+          ubuntu: {
+            preInstallPackages: ["curl", "unzip"],
 
-          preInstallScripts: {
-            "rclone.sh": text`
+            preInstallScripts: {
+              "rclone.sh": text`
               #!/bin/sh
               set -e
 
               curl https://rclone.org/install.sh | bash
             `,
+            },
+
+            allowedEndpoints: ["rclone.org:443", "downloads.rclone.org:443"],
           },
 
-          allowedEndpoints: ["rclone.org:443", "downloads.rclone.org:443"],
-        },
+          allowedEndpoints: [
+            ...(args.allowedEndpoints ?? []),
+            ...(args.resticRepo.remoteEndpoints ?? []),
+          ],
 
-        allowedEndpoints: [
-          ...(args.allowedEndpoints ?? []),
-          ...(args.resticRepo.remoteEndpoints ?? []),
-        ],
-
-        environment: {
-          RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${repositoryPath}`,
-          RESTIC_PASSWORD_FILE: "/credentials/password",
-          RESTIC_HOSTNAME: "default",
-          RCLONE_CONFIG: "/credentials/rclone.conf",
-          EXTRA_BACKUP_OPTIONS: args.backupOptions?.join(" "),
-        },
+          environment: {
+            RESTIC_REPOSITORY: repoPath,
+            RESTIC_PASSWORD_FILE: "/credentials/password",
+            RESTIC_HOSTNAME: "default",
+            RCLONE_CONFIG: "/credentials/rclone.conf",
+            EXTRA_BACKUP_OPTIONS: args.backupOptions?.join(" "),
+          },
 
-        volumes: [this.credentials, ...(args.volume ? [args.volume] : [])],
+          volumes: [this.credentials, ...(args.volume ? [args.volume] : [])],
 
-        volumeMounts: [
-          {
-            volume: this.credentials,
-            mountPath: "/credentials",
-            readOnly: true,
-          },
-          ...(args.volume
-            ? [
-                {
-                  volume: args.volume,
-                  mountPath: "/data",
-                  subPath: args.subPath,
-                },
-              ]
-            : []),
-        ],
-      } satisfies ScriptEnvironment
-    })
+          volumeMounts: [
+            {
+              volume: this.credentials,
+              mountPath: "/credentials",
+              readOnly: true,
+            },
+            ...(args.volume
+              ? [
+                  {
+                    volume: args.volume,
+                    mountPath: "/data",
+                    subPath: args.subPath,
+                  },
+                ]
+              : []),
+          ],
+        } satisfies ScriptEnvironment
+      },
+    )
 
     this.scriptBundle = output(args).apply(args => {
       return new ScriptBundle(
@@ -291,6 +304,38 @@ export class BackupJobPair extends ComponentResource {
     }
   }
 
+  createTerminal(): InstanceTerminal {
+    return {
+      name: "restic",
+
+      meta: {
+        title: "Restic",
+        description: "Manage Restic repository",
+        icon: "material-symbols:backup",
+      },
+
+      image: images["terminal-restic"].image,
+      command: ["bash", "/welcome.sh"],
+
+      files: {
+        "/welcome.sh": text`
+          echo "Use 'restic' to manage the repository."
+          echo
+
+          exec bash
+        `,
+
+        "/credentials/password": output(this.args).backupPassword,
+        "/root/.config/rclone/rclone.conf": output(this.args).resticRepo.rcloneConfig,
+      },
+
+      env: {
+        RESTIC_REPOSITORY: this.resticRepoPath,
+        RESTIC_PASSWORD_FILE: "/credentials/password",
+      },
+    }
+  }
+
   private async createBackupOnDestroyJob(): Promise<void> {
     new batch.v1.Job(
       `${this.name}-backup-on-destroy`,

package/src/repo/index.ts

@@ -40,7 +40,7 @@ export default outputs({
     remoteEndpoints,
   },
 
-  $status: {
+  $statusFields: {
     remoteName,
 
     remoteEndpoints: {