Replace gen-schema Go module with zarf internal gen-types-schema cmd

defenseunicorns · Nov 30, 2023 · 94be272 · 94be272
1 parent 261add9
commit 94be272
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 1,455 deletions.
diff --git a/capabilities/zarf-types.ts b/capabilities/zarf-types.ts
@@ -9,6 +9,7 @@
 
 export interface ZarfTypes {
     DeployedPackage: DeployedPackage;
+    ZarfPackage:     ZarfPackage;
     ZarfState:       ZarfState;
 }
 
@@ -447,7 +448,7 @@ export interface ZarfChart {
      */
     gitPath?: string;
     /**
-     * The path to the chart folder
+     * The path to the local chart's folder or .tgz archive
      */
     localPath?: string;
     /**
@@ -1160,6 +1161,7 @@ function r(name: string) {
 const typeMap: any = {
     "ZarfTypes": o([
         { json: "DeployedPackage", js: "DeployedPackage", typ: r("DeployedPackage") },
+        { json: "ZarfPackage", js: "ZarfPackage", typ: r("ZarfPackage") },
         { json: "ZarfState", js: "ZarfState", typ: r("ZarfState") },
     ], false),
     "DeployedPackage": o([

diff --git a/go.work b/go.work
diff --git a/go.work.sum b/go.work.sum
diff --git a/hack/gen-schema/gen-schema.sh b/hack/gen-schema/gen-schema.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
 # Create the json schema for the Zarf structs and use it to create the typescript definitions
-go run hack/gen-schema/main.go | npx quicktype -s schema -o ./capabilities/zarf-types.ts
+zarf internal gen-types-schema | npx quicktype -s schema -o ./capabilities/zarf-types.ts
diff --git a/hack/gen-schema/go.mod b/hack/gen-schema/go.mod