@highstate/restic 0.9.8 → 0.9.10

package/dist/highstate.manifest.json

@@ -1,6 +1,6 @@
 {
   "sourceHashes": {
-    "./dist/index.js": "89aa763d7ecb7bcbc281fd325cd20cbc8b18a2750847969b31966e4de0ed7a97",
-    "./dist/repo/index.js": "94984771a19ba80aaa2d9a30319b357153015252a1ef8834324ba3097bf8afe9"
+    "./dist/index.js": "1610a5acb7fc1e922d3121c831b882ff287ac0cf2749bceefdb69d39f39201ce",
+    "./dist/repo/index.js": "710d064bd08ed46062ec95e3181eef9edcce42e7db06af5011a1dafc94f2209a"
   }
 }

package/dist/index.js

@@ -4508,7 +4508,7 @@ var require_core2 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var id_1 = require_id();
     var ref_1 = require_ref();
-    var core2 = [
+    var core = [
       "$schema",
       "$id",
       "$defs",
@@ -4518,7 +4518,7 @@ var require_core2 = __commonJS({
       id_1.default,
       ref_1.default
     ];
-    exports.default = core2;
+    exports.default = core;
   }
 });
 
@@ -6394,20 +6394,25 @@ var require_ajv = __commonJS({
 });
 
 // src/job-pair.ts
-import { batch, core } from "@pulumi/kubernetes";
+import { batch } from "@pulumi/kubernetes";
 import {
   createScriptContainer,
   CronJob,
   Job,
-  mapMetadata,
-  ScriptBundle
+  ScriptBundle,
+  Secret
 } from "@highstate/k8s";
 import {
   ComponentResource,
+  getUnitInstanceName,
   normalize,
   output
 } from "@highstate/pulumi";
 
+// ../contract/dist/index.js
+import { mapValues as mapValues3 } from "remeda";
+import { mapValues as mapValues2 } from "remeda";
+
 // ../../node_modules/@sinclair/typebox/build/esm/type/guard/value.mjs
 var value_exports = {};
 __export(value_exports, {
@@ -9021,6 +9026,7 @@ var Type = type_exports2;
 
 // ../contract/dist/index.js
 var import_ajv = __toESM(require_ajv(), 1);
+import { isNonNullish, mapValues, pickBy } from "remeda";
 var boundaryInput = Symbol("boundaryInput");
 function text(strings, ...values) {
   const stringValues = values.map(String);
@@ -9145,12 +9151,13 @@ var BackupJobPair = class extends ComponentResource {
     this.name = name;
     this.opts = opts;
     this.credentials = output(args).apply((args2) => {
-      return new core.v1.Secret(
+      return Secret.create(
         `${name}-backup-credentials`,
         {
-          metadata: mapMetadata(args2, `${name}-backup-credentials`),
+          namespace: args2.namespace,
+          cluster: args2.cluster,
           stringData: {
-            password: args2.resticRepo.password,
+            password: args2.backupPassword,
             "rclone.conf": args2.resticRepo.rcloneConfig
           }
         },
@@ -9158,6 +9165,7 @@ var BackupJobPair = class extends ComponentResource {
       );
     });
     const environment = output(args).apply((args2) => {
+      const repositoryPath = args2.resticRepo.pathPattern.replace(/\$clusterName/g, args2.cluster.name).replace(/\$appName/g, name).replace(/\$unitName/g, getUnitInstanceName());
       return {
         alpine: {
           packages: ["rclone"]
@@ -9180,7 +9188,7 @@ var BackupJobPair = class extends ComponentResource {
           ]
         },
         environment: {
-          RESTIC_REPOSITORY: `rclone:${args2.resticRepo.remoteName}:${args2.resticRepo.basePath}/${args2.cluster.name}/${name}`,
+          RESTIC_REPOSITORY: `rclone:${args2.resticRepo.remoteName}:${repositoryPath}`,
           RESTIC_PASSWORD_FILE: "/credentials/password",
           RESTIC_HOSTNAME: "default",
           RCLONE_CONFIG: "/credentials/rclone.conf",
@@ -9229,7 +9237,8 @@ var BackupJobPair = class extends ComponentResource {
             ...args2.restoreContainer,
             main: "restore.sh",
             bundle: this.scriptBundle
-          })
+          }),
+          backoffLimit: 2
         },
         { ...opts, parent: this }
       );
@@ -9249,12 +9258,7 @@ var BackupJobPair = class extends ComponentResource {
           concurrencyPolicy: "Forbid",
           jobTemplate: {
             spec: {
-              backoffLimit: 1,
-              template: {
-                spec: {
-                  restartPolicy: "Never"
-                }
-              }
+              backoffLimit: 2
             }
           }
         },