@highstate/restic 0.9.15 → 0.9.18

package/dist/repo/index.js

@@ -1,10 +1,9 @@
-import "../chunk-G3PMV62Z.js";
+import '../chunk-G3PMV62Z.js';
+import { restic } from '@highstate/library';
+import { forUnit, toPromise } from '@highstate/pulumi';
+import { parseL34Endpoint, l34EndpointToString } from '@highstate/common';
+import { uniqueBy } from 'remeda';
 
-// src/repo/index.ts
-import { restic } from "@highstate/library";
-import { forUnit, toPromise } from "@highstate/pulumi";
-import { l34EndpointToString, parseL34Endpoint } from "@highstate/common";
-import { uniqueBy } from "remeda";
 var { args, inputs, secrets, outputs } = forUnit(restic.repo);
 var remoteName = secrets.rcloneConfig.apply((config) => {
   const remoteNames = Array.from(config.matchAll(/(?<=\[).+?(?=\])/g));
@@ -34,7 +33,7 @@ var repo_default = outputs({
     remoteName,
     remoteEndpoints
   },
-  $status: {
+  $statusFields: {
     remoteName,
     remoteEndpoints: {
       value: remoteEndpoints.map(l34EndpointToString),
@@ -42,7 +41,7 @@ var repo_default = outputs({
     }
   }
 });
-export {
-  repo_default as default
-};
+
+export { repo_default as default };
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/repo/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/repo/index.ts"],"sourcesContent":["import { restic } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\nimport { l34EndpointToString, parseL34Endpoint } from \"@highstate/common\"\nimport { uniqueBy } from \"remeda\"\n\nconst { args, inputs, 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 { remoteL3Endpoints, remoteL4Endpoints } = await toPromise(inputs)\n\nconst remoteEndpoints = uniqueBy(\n  [\n    //\n    ...args.remoteEndpoints.map(parseL34Endpoint),\n    ...remoteL3Endpoints,\n    ...remoteL4Endpoints,\n  ],\n  l34EndpointToString,\n)\n\nexport default outputs({\n  repo: {\n    type: \"rclone\",\n    pathPattern: args.pathPattern,\n    rcloneConfig: secrets.rcloneConfig,\n    remoteName,\n    remoteEndpoints,\n  },\n\n  $status: {\n    remoteName,\n\n    remoteEndpoints: {\n      value: remoteEndpoints.map(l34EndpointToString),\n      complementaryTo: \"remoteEndpoints\",\n    },\n  },\n})\n"],"mappings":";;;AAAA,SAAS,cAAc;AACvB,SAAS,SAAS,iBAAiB;AACnC,SAAS,qBAAqB,wBAAwB;AACtD,SAAS,gBAAgB;AAEzB,IAAM,EAAE,MAAM,QAAQ,SAAS,QAAQ,IAAI,QAAQ,OAAO,IAAI;AAE9D,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,EAAE,mBAAmB,kBAAkB,IAAI,MAAM,UAAU,MAAM;AAEvE,IAAM,kBAAkB;AAAA,EACtB;AAAA;AAAA,IAEE,GAAG,KAAK,gBAAgB,IAAI,gBAAgB;AAAA,IAC5C,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AAAA,EACA;AACF;AAEA,IAAO,eAAQ,QAAQ;AAAA,EACrB,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,aAAa,KAAK;AAAA,IAClB,cAAc,QAAQ;AAAA,IACtB;AAAA,IACA;AAAA,EACF;AAAA,EAEA,SAAS;AAAA,IACP;AAAA,IAEA,iBAAiB;AAAA,MACf,OAAO,gBAAgB,IAAI,mBAAmB;AAAA,MAC9C,iBAAiB;AAAA,IACnB;AAAA,EACF;AACF,CAAC;","names":[]}
+{"version":3,"sources":["../../src/repo/index.ts"],"names":[],"mappings":";;;;;;AAKA,IAAM,EAAE,MAAM,MAAA,EAAQ,OAAA,EAAS,SAAQ,GAAI,OAAA,CAAQ,OAAO,IAAI,CAAA;AAE9D,IAAM,UAAA,GAAa,OAAA,CAAQ,YAAA,CAAa,KAAA,CAAM,CAAA,MAAA,KAAU;AACtD,EAAA,MAAM,cAAc,KAAA,CAAM,IAAA,CAAK,MAAA,CAAO,QAAA,CAAS,mBAAmB,CAAC,CAAA;AAEnE,EAAA,IAAI,WAAA,CAAY,WAAW,CAAA,EAAG;AAC5B,IAAA,MAAM,IAAI,MAAM,mCAAmC,CAAA;AAAA,EACrD;AAEA,EAAA,IAAI,WAAA,CAAY,SAAS,CAAA,EAAG;AAC1B,IAAA,MAAM,IAAI,MAAM,yCAAyC,CAAA;AAAA,EAC3D;AAEA,EAAA,OAAO,WAAA,CAAY,CAAC,CAAA,CAAE,CAAC,CAAA;AACzB,CAAC,CAAA;AAED,IAAM,EAAE,iBAAA,EAAmB,iBAAA,EAAkB,GAAI,MAAM,UAAU,MAAM,CAAA;AAEvE,IAAM,eAAA,GAAkB,QAAA;AAAA,EACtB;AAAA;AAAA,IAEE,GAAG,IAAA,CAAK,eAAA,CAAgB,GAAA,CAAI,gBAAgB,CAAA;AAAA,IAC5C,GAAG,iBAAA;AAAA,IACH,GAAG;AAAA,GACL;AAAA,EACA;AACF,CAAA;AAEA,IAAO,eAAQ,OAAA,CAAQ;AAAA,EACrB,IAAA,EAAM;AAAA,IACJ,IAAA,EAAM,QAAA;AAAA,IACN,aAAa,IAAA,CAAK,WAAA;AAAA,IAClB,cAAc,OAAA,CAAQ,YAAA;AAAA,IACtB,UAAA;AAAA,IACA;AAAA,GACF;AAAA,EAEA,aAAA,EAAe;AAAA,IACb,UAAA;AAAA,IAEA,eAAA,EAAiB;AAAA,MACf,KAAA,EAAO,eAAA,CAAgB,GAAA,CAAI,mBAAmB,CAAA;AAAA,MAC9C,eAAA,EAAiB;AAAA;AACnB;AAEJ,CAAC","file":"index.js","sourcesContent":["import { restic } from \"@highstate/library\"\nimport { forUnit, toPromise } from \"@highstate/pulumi\"\nimport { l34EndpointToString, parseL34Endpoint } from \"@highstate/common\"\nimport { uniqueBy } from \"remeda\"\n\nconst { args, inputs, 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 { remoteL3Endpoints, remoteL4Endpoints } = await toPromise(inputs)\n\nconst remoteEndpoints = uniqueBy(\n  [\n    //\n    ...args.remoteEndpoints.map(parseL34Endpoint),\n    ...remoteL3Endpoints,\n    ...remoteL4Endpoints,\n  ],\n  l34EndpointToString,\n)\n\nexport default outputs({\n  repo: {\n    type: \"rclone\",\n    pathPattern: args.pathPattern,\n    rcloneConfig: secrets.rcloneConfig,\n    remoteName,\n    remoteEndpoints,\n  },\n\n  $statusFields: {\n    remoteName,\n\n    remoteEndpoints: {\n      value: remoteEndpoints.map(l34EndpointToString),\n      complementaryTo: \"remoteEndpoints\",\n    },\n  },\n})\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highstate/restic",
-  "version": "0.9.15",
+  "version": "0.9.18",
   "type": "module",
   "files": [
     "dist",
@@ -21,15 +21,15 @@
     "update-images": "../../scripts/update-images.sh ./assets/images.json"
   },
   "dependencies": {
-    "@highstate/common": "^0.9.15",
-    "@highstate/k8s": "^0.9.15",
-    "@highstate/library": "^0.9.15",
-    "@highstate/pulumi": "^0.9.15",
+    "@highstate/common": "^0.9.18",
+    "@highstate/k8s": "^0.9.18",
+    "@highstate/library": "^0.9.18",
+    "@highstate/pulumi": "^0.9.18",
     "@pulumi/kubernetes": "^4.18.0",
     "remeda": "^2.21.0"
   },
   "devDependencies": {
-    "@highstate/cli": "^0.9.15"
+    "@highstate/cli": "^0.9.18"
   },
-  "gitHead": "f61b9905d4cd50511b03331411f42595403ebc06"
+  "gitHead": "9ebcd7da56b00b8ca08bf52cc8438f527338cd64"
 }

package/src/job-pair.ts

@@ -40,7 +40,7 @@ export type BackupJobPairArgs = CommonArgs & {
   /**
    * The repository to backup/restore to/from.
    */
-  resticRepo: Input<restic.Repo>
+  resticRepo: Input<restic.Repository>
 
   /**
    * The password used to encrypt the backups.
@@ -307,9 +307,12 @@ export class BackupJobPair extends ComponentResource {
   createTerminal(): InstanceTerminal {
     return {
       name: "restic",
-      title: "Restic",
-      description: "Manage Restic repository",
-      icon: "material-symbols:backup",
+
+      meta: {
+        title: "Restic",
+        description: "Manage Restic repository",
+        icon: "material-symbols:backup",
+      },
 
       image: images["terminal-restic"].image,
       command: ["bash", "/welcome.sh"],

package/src/repo/index.ts

@@ -40,7 +40,7 @@ export default outputs({
     remoteEndpoints,
   },
 
-  $status: {
+  $statusFields: {
     remoteName,
 
     remoteEndpoints: {