@highstate/restic 0.9.3 → 0.9.5

package/dist/highstate.manifest.json

@@ -1,6 +1,6 @@
 {
   "sourceHashes": {
-    "./dist/index.js": "9ca3ce053d1d1a4b06aab7eec3d8b32a0b5feedfc0881995cd48b6c1a7d7e1c3",
-    "./dist/repo/index.js": "59c746570d6c37d963683bf8a05779363f7ba370ad08cb9580072357a0d06f20"
+    "./dist/index.js": "8f21fa7e7af9c10ce08ef55973084b0aea647a79ff674f1cb70126ba706ae601",
+    "./dist/repo/index.js": "94984771a19ba80aaa2d9a30319b357153015252a1ef8834324ba3097bf8afe9"
   }
 }

package/dist/index.js

@@ -9022,13 +9022,20 @@ var Type = type_exports2;
 // ../contract/dist/index.js
 var import_ajv = __toESM(require_ajv(), 1);
 var boundaryInput = Symbol("boundaryInput");
-function text(array, ...values) {
-  const str = array.reduce(
-    // eslint-disable-next-line @typescript-eslint/no-base-to-string
-    (result, part, i) => result + part + (values[i] ? String(values[i]) : ""),
-    ""
-  );
-  return trimIndentation(str);
+function text(strings, ...values) {
+  const stringValues = values.map(String);
+  let result = "";
+  for (let i = 0; i < strings.length; i++) {
+    result += strings[i];
+    if (i < stringValues.length) {
+      const value = stringValues[i];
+      const lines = value.split("\n");
+      const lastLineIndentMatch = strings[i].match(/(?:^|\n)([ \t]*)$/);
+      const indent = lastLineIndentMatch ? lastLineIndentMatch[1] : "";
+      result += lines.map((line, j) => j === 0 ? line : indent + line).join("\n");
+    }
+  }
+  return trimIndentation(result);
 }
 function trimIndentation(text2) {
   const lines = text2.split("\n");
@@ -9057,7 +9064,7 @@ var backupEnvironment = {
   ubuntu: {
     packages: ["restic"]
   },
-  scripts: {
+  files: {
     "backup.sh": text`
       #!/bin/sh
       set -e
@@ -9147,7 +9154,7 @@ var BackupJobPair = class extends ComponentResource {
             "rclone.conf": args2.resticRepo.rcloneConfig
           }
         },
-        { parent: this, ...opts }
+        { ...opts, parent: this }
       );
     });
     const environment = output(args).apply((args2) => {
@@ -9164,10 +9171,16 @@ var BackupJobPair = class extends ComponentResource {
 
               curl https://rclone.org/install.sh | bash
             `
-          }
+          },
+          allowedEndpoints: [
+            "rclone.org:443",
+            "downloads.rclone.org:443",
+            ...args2.allowedEndpoints ?? [],
+            ...args2.resticRepo.remoteEndpoints ?? []
+          ]
         },
         environment: {
-          RESTIC_REPOSITORY: `rclone:${args2.resticRepo.remoteName}:${args2.resticRepo.basePath}/${args2.k8sCluster.info.name}/${name}`,
+          RESTIC_REPOSITORY: `rclone:${args2.resticRepo.remoteName}:${args2.resticRepo.basePath}/${args2.cluster.name}/${name}`,
           RESTIC_PASSWORD_FILE: "/credentials/password",
           RESTIC_HOSTNAME: "default",
           RCLONE_CONFIG: "/credentials/rclone.conf",
@@ -9194,6 +9207,7 @@ var BackupJobPair = class extends ComponentResource {
       return new ScriptBundle(
         `${name}-backup-scripts`,
         {
+          cluster: args2.cluster,
           namespace: args2.namespace,
           distribution: args2.distribution ?? "alpine",
           environments: [
@@ -9202,13 +9216,14 @@ var BackupJobPair = class extends ComponentResource {
             ...normalize(args2.environment, args2.environments)
           ]
         },
-        { parent: this, ...opts }
+        { ...opts, parent: this }
       );
     });
     this.restoreJob = output(args).apply((args2) => {
       return new Job(
         `${name}-restore`,
         {
+          cluster: args2.cluster,
           namespace: args2.namespace,
           container: createScriptContainer({
             ...args2.restoreContainer,
@@ -9216,7 +9231,7 @@ var BackupJobPair = class extends ComponentResource {
             bundle: this.scriptBundle
           })
         },
-        { parent: this, ...opts }
+        { ...opts, parent: this }
       );
     });
     this.backupJob = output(args).apply((args2) => {
@@ -9224,6 +9239,7 @@ var BackupJobPair = class extends ComponentResource {
         `${name}-backup`,
         {
           namespace: args2.namespace,
+          cluster: args2.cluster,
           container: createScriptContainer({
             ...args2.backupContainer,
             main: "backup.sh",
@@ -9242,15 +9258,9 @@ var BackupJobPair = class extends ComponentResource {
             }
           }
         },
-        { parent: this, ...opts }
+        { ...opts, parent: this }
       );
     });
-    this.registerOutputs({
-      credentials: this.credentials,
-      scriptBundle: this.scriptBundle,
-      restoreJob: this.restoreJob,
-      backupJob: this.backupJob
-    });
   }
   /**
    * The credentials used to access the repository and encrypt the backups.
@@ -9294,7 +9304,7 @@ var BackupJobPair = class extends ComponentResource {
         },
         spec: this.backupJob.cronJob.spec.jobTemplate.spec
       },
-      { parent: this, ...this.opts }
+      { ...this.opts, parent: this }
     );
   }
 };