@highstate/restic 0.9.4 → 0.9.5

package/dist/repo/index.js

@@ -23,7 +23,7 @@ var repo_default = outputs({
     type: "rclone",
     rcloneConfig: secrets.rcloneConfig,
     remoteName,
-    remoteDomains: args.remoteDomains ?? [],
+    remoteEndpoints: args.remoteDomains ?? [],
     basePath
   },
   $status: {

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    remoteDomains: 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,eAAe,KAAK,iBAAiB,CAAC;AAAA,IACtC;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, 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":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "type": "module",
   "files": [
     "dist",
@@ -20,14 +20,14 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.4",
-    "@highstate/k8s": "^0.9.4",
-    "@highstate/library": "^0.9.4",
-    "@highstate/pulumi": "^0.9.4",
+    "@highstate/common": "^0.9.5",
+    "@highstate/k8s": "^0.9.5",
+    "@highstate/library": "^0.9.5",
+    "@highstate/pulumi": "^0.9.5",
     "@pulumi/kubernetes": "^4.18.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.4"
+    "@highstate/cli": "^0.9.5"
   },
-  "gitHead": "021af8cde467823881e2dc82ccb606c9617772ea"
+  "gitHead": "93fa1e8b1189a5232055c852fd79a684d8b80444"
 }

package/src/job-pair.ts

@@ -1,4 +1,5 @@
 import type { k8s, restic } from "@highstate/library"
+import type { InputL34Endpoint } from "@highstate/common"
 import { batch, core } from "@pulumi/kubernetes"
 import {
   createScriptContainer,
@@ -30,7 +31,7 @@ export type BackupJobPairArgs = CommonArgs & {
   /**
    * The k8s cluster to calculate the repository path.
    */
-  k8sCluster: Input<k8s.Cluster>
+  cluster: Input<k8s.Cluster>
 
   /**
    * The repository to backup/restore to/from.
@@ -87,6 +88,11 @@ export type BackupJobPairArgs = CommonArgs & {
    * You can also use `ubuntu` if you need to install packages that are not available (or working) in Alpine.
    */
   distribution?: ScriptDistribution
+
+  /**
+   * Extra allowed endpoints for the backup and restore jobs.
+   */
+  allowedEndpoints?: InputArray<InputL34Endpoint>
 }
 
 export class BackupJobPair extends ComponentResource {
@@ -128,7 +134,7 @@ export class BackupJobPair extends ComponentResource {
             "rclone.conf": args.resticRepo.rcloneConfig,
           },
         },
-        { parent: this, ...opts },
+        { ...opts, parent: this },
       )
     })
 
@@ -149,10 +155,17 @@ export class BackupJobPair extends ComponentResource {
               curl https://rclone.org/install.sh | bash
             `,
           },
+
+          allowedEndpoints: [
+            "rclone.org:443",
+            "downloads.rclone.org:443",
+            ...(args.allowedEndpoints ?? []),
+            ...(args.resticRepo.remoteEndpoints ?? []),
+          ],
         },
 
         environment: {
-          RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${args.resticRepo.basePath}/${args.k8sCluster.info.name}/${name}`,
+          RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${args.resticRepo.basePath}/${args.cluster.name}/${name}`,
           RESTIC_PASSWORD_FILE: "/credentials/password",
           RESTIC_HOSTNAME: "default",
           RCLONE_CONFIG: "/credentials/rclone.conf",
@@ -184,6 +197,7 @@ export class BackupJobPair extends ComponentResource {
       return new ScriptBundle(
         `${name}-backup-scripts`,
         {
+          cluster: args.cluster,
           namespace: args.namespace,
           distribution: args.distribution ?? "alpine",
 
@@ -193,7 +207,7 @@ export class BackupJobPair extends ComponentResource {
             ...normalize(args.environment, args.environments),
           ],
         },
-        { parent: this, ...opts },
+        { ...opts, parent: this },
       )
     })
 
@@ -201,6 +215,7 @@ export class BackupJobPair extends ComponentResource {
       return new Job(
         `${name}-restore`,
         {
+          cluster: args.cluster,
           namespace: args.namespace,
 
           container: createScriptContainer({
@@ -210,7 +225,7 @@ export class BackupJobPair extends ComponentResource {
             bundle: this.scriptBundle,
           }),
         },
-        { parent: this, ...opts },
+        { ...opts, parent: this },
       )
     })
 
@@ -219,6 +234,7 @@ export class BackupJobPair extends ComponentResource {
         `${name}-backup`,
         {
           namespace: args.namespace,
+          cluster: args.cluster,
 
           container: createScriptContainer({
             ...args.backupContainer,
@@ -241,16 +257,9 @@ export class BackupJobPair extends ComponentResource {
             },
           },
         },
-        { parent: this, ...opts },
+        { ...opts, parent: this },
       )
     })
-
-    this.registerOutputs({
-      credentials: this.credentials,
-      scriptBundle: this.scriptBundle,
-      restoreJob: this.restoreJob,
-      backupJob: this.backupJob,
-    })
   }
 
   handleTrigger(triggers: InstanceTriggerInvocation[]): InstanceTrigger | undefined {
@@ -282,7 +291,7 @@ export class BackupJobPair extends ComponentResource {
         },
         spec: this.backupJob.cronJob.spec.jobTemplate.spec,
       },
-      { parent: this, ...this.opts },
+      { ...this.opts, parent: this },
     )
   }
 }

package/src/repo/index.ts

@@ -27,7 +27,7 @@ export default outputs({
     type: "rclone",
     rcloneConfig: secrets.rcloneConfig,
     remoteName,
-    remoteDomains: args.remoteDomains ?? [],
+    remoteEndpoints: args.remoteDomains ?? [],
     basePath,
   },
   $status: {

package/src/scripts.ts

@@ -10,7 +10,7 @@ export const backupEnvironment: ScriptEnvironment = {
     packages: ["restic"],
   },
 
-  scripts: {
+  files: {
     "backup.sh": text`
       #!/bin/sh
       set -e