@highstate/restic 0.9.9 → 0.9.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.9",
+  "version": "0.9.11",
   "type": "module",
   "files": [
     "dist",
@@ -20,15 +20,15 @@
     "build": "highstate build"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.9",
-    "@highstate/k8s": "^0.9.9",
-    "@highstate/library": "^0.9.9",
-    "@highstate/pulumi": "^0.9.9",
+    "@highstate/common": "^0.9.11",
+    "@highstate/k8s": "^0.9.11",
+    "@highstate/library": "^0.9.11",
+    "@highstate/pulumi": "^0.9.11",
     "@pulumi/kubernetes": "^4.18.0",
     "remeda": "^2.21.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.9"
+    "@highstate/cli": "^0.9.11"
   },
-  "gitHead": "1c04a713fa1bb7c0231e5e6d0537709097bb0e8e"
+  "gitHead": "d62cae30ea9fadaa1aa4fb3b5734a16cf53810ce"
 }

package/src/job-pair.ts

@@ -1,12 +1,13 @@
 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,
+  getProvider,
   Job,
-  mapMetadata,
   ScriptBundle,
+  Secret,
   type CommonArgs,
   type Container,
   type ScriptDistribution,
@@ -105,7 +106,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,16 +125,17 @@ export class BackupJobPair extends ComponentResource {
 
   constructor(
     private readonly name: string,
-    args: BackupJobPairArgs,
+    private readonly args: BackupJobPairArgs,
     private readonly opts?: ComponentResourceOptions,
   ) {
     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.backupPassword,
@@ -167,14 +169,14 @@ export class BackupJobPair extends ComponentResource {
             `,
           },
 
-          allowedEndpoints: [
-            "rclone.org:443",
-            "downloads.rclone.org:443",
-            ...(args.allowedEndpoints ?? []),
-            ...(args.resticRepo.remoteEndpoints ?? []),
-          ],
+          allowedEndpoints: ["rclone.org:443", "downloads.rclone.org:443"],
         },
 
+        allowedEndpoints: [
+          ...(args.allowedEndpoints ?? []),
+          ...(args.resticRepo.remoteEndpoints ?? []),
+        ],
+
         environment: {
           RESTIC_REPOSITORY: `rclone:${args.resticRepo.remoteName}:${repositoryPath}`,
           RESTIC_PASSWORD_FILE: "/credentials/password",
@@ -235,6 +237,8 @@ export class BackupJobPair extends ComponentResource {
             main: "restore.sh",
             bundle: this.scriptBundle,
           }),
+
+          backoffLimit: 2,
         },
         { ...opts, parent: this },
       )
@@ -259,12 +263,7 @@ export class BackupJobPair extends ComponentResource {
 
           jobTemplate: {
             spec: {
-              backoffLimit: 1,
-              template: {
-                spec: {
-                  restartPolicy: "Never",
-                },
-              },
+              backoffLimit: 2,
             },
           },
         },
@@ -278,7 +277,7 @@ export class BackupJobPair extends ComponentResource {
     const invokedTrigger = triggers.find(trigger => trigger.name === triggerName)
 
     if (invokedTrigger) {
-      this.createBackupOnDestroyJob()
+      void this.createBackupOnDestroyJob()
       return
     }
 
@@ -292,7 +291,7 @@ export class BackupJobPair extends ComponentResource {
     }
   }
 
-  private createBackupOnDestroyJob(): void {
+  private async createBackupOnDestroyJob(): Promise<void> {
     new batch.v1.Job(
       `${this.name}-backup-on-destroy`,
       {
@@ -302,7 +301,7 @@ export class BackupJobPair extends ComponentResource {
         },
         spec: this.backupJob.cronJob.spec.jobTemplate.spec,
       },
-      { ...this.opts, parent: this },
+      { ...this.opts, parent: this, provider: await getProvider(this.args.cluster) },
     )
   }
 }