@highstate/restic 0.9.13 → 0.9.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.13",
+  "version": "0.9.15",
   "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.13",
-    "@highstate/k8s": "^0.9.13",
-    "@highstate/library": "^0.9.13",
-    "@highstate/pulumi": "^0.9.13",
+    "@highstate/common": "^0.9.15",
+    "@highstate/k8s": "^0.9.15",
+    "@highstate/library": "^0.9.15",
+    "@highstate/pulumi": "^0.9.15",
     "@pulumi/kubernetes": "^4.18.0",
     "remeda": "^2.21.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.13"
+    "@highstate/cli": "^0.9.15"
   },
-  "gitHead": "409b125db59464bd2b6afa36cc5c92e114c7312b"
+  "gitHead": "f61b9905d4cd50511b03331411f42595403ebc06"
 }

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 & {
@@ -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,35 @@ export class BackupJobPair extends ComponentResource {
     }
   }
 
+  createTerminal(): InstanceTerminal {
+    return {
+      name: "restic",
+      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`,