From 18a20407f6c20614f585871ac89bb83ad3c5cc9a Mon Sep 17 00:00:00 2001 From: J H Date: Fri, 15 Mar 2024 13:31:44 -0600 Subject: [PATCH] chore: Fix the build --- core/startos/bindings/DependencyRequirement.ts | 4 +--- core/startos/src/service/service_effect_handler.rs | 4 +++- patch-db | 2 +- sdk/lib/util/Overlay.ts | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/startos/bindings/DependencyRequirement.ts b/core/startos/bindings/DependencyRequirement.ts index 9ece754c1..0179c0e84 100644 --- a/core/startos/bindings/DependencyRequirement.ts +++ b/core/startos/bindings/DependencyRequirement.ts @@ -1,6 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. import type { DependencyKind } from "./DependencyKind"; -import type { HealthCheckId } from "./HealthCheckId"; -import type { PackageId } from "./PackageId"; -export interface DependencyRequirement { id: PackageId, kind: DependencyKind, healthChecks: Array, } \ No newline at end of file +export interface DependencyRequirement { id: string, kind: DependencyKind, healthChecks: string[], } \ No newline at end of file diff --git a/core/startos/src/service/service_effect_handler.rs b/core/startos/src/service/service_effect_handler.rs index fa5df79de..1dc8eb158 100644 --- a/core/startos/src/service/service_effect_handler.rs +++ b/core/startos/src/service/service_effect_handler.rs @@ -875,16 +875,18 @@ enum DependencyKind { #[serde(rename_all = "camelCase")] #[ts(export)] struct DependencyRequirement { + #[ts(type = "string")] id: PackageId, kind: DependencyKind, #[serde(default)] + #[ts(type = "string[]")] health_checks: BTreeSet, } // filebrowser:exists,bitcoind:running:foo+bar+baz impl FromStr for DependencyRequirement { type Err = Error; fn from_str(s: &str) -> Result { - match s.split_once(":") { + match s.split_once(':') { Some((id, "e")) | Some((id, "exists")) => Ok(Self { id: id.parse()?, kind: DependencyKind::Exists, diff --git a/patch-db b/patch-db index e4a3f7b57..3dc11afd4 160000 --- a/patch-db +++ b/patch-db @@ -1 +1 @@ -Subproject commit e4a3f7b577df56c611b21d5ad03eb459e80fb919 +Subproject commit 3dc11afd46d93094ac52ae1fef311a91c4561e8c diff --git a/sdk/lib/util/Overlay.ts b/sdk/lib/util/Overlay.ts index 36dbaead5..53d631f51 100644 --- a/sdk/lib/util/Overlay.ts +++ b/sdk/lib/util/Overlay.ts @@ -54,7 +54,7 @@ export class Overlay { async destroy() { const imageId = this.imageId const guid = this.guid - await this.effects.destroyOverlayedImage({ imageId, guid }) + await this.effects.destroyOverlayedImage({ guid }) } async exec(