fix(deps): update zarf to v0.39.0 (#907)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: unclegedd <gedd@defenseunicorns.com> Co-authored-by: UncleGedd <42304551+UncleGedd@users.noreply.github.com>
defenseunicorns · Sep 6, 2024 · 10ef18e · 10ef18e
1 parent 571ac4a
commit 10ef18e
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/defenseunicorns/pkg/helpers/v2 v2.0.1
 	github.com/defenseunicorns/pkg/oci v1.0.1
 	github.com/defenseunicorns/uds-security-hub v0.0.7
+	github.com/fatih/color v1.17.0
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/goccy/go-yaml v1.12.0
 	github.com/mholt/archiver/v3 v3.5.1
@@ -20,7 +21,7 @@ require (
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	github.com/zarf-dev/zarf v0.38.3
+	github.com/zarf-dev/zarf v0.39.0
 	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
 	golang.org/x/mod v0.20.0
 	golang.org/x/sync v0.8.0
@@ -210,7 +211,6 @@ require (
 	github.com/facebookincubator/nvdtools v0.1.5 // indirect
 	github.com/fairwindsops/pluto/v5 v5.18.4 // indirect
 	github.com/fatih/camelcase v1.0.0 // indirect
-	github.com/fatih/color v1.17.0 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fluxcd/helm-controller/api v1.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -2239,8 +2239,8 @@ github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M
 github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 github.com/zalando/go-keyring v0.2.2 h1:f0xmpYiSrHtSNAVgwip93Cg8tuF45HJM6rHq/A5RI/4=
 github.com/zalando/go-keyring v0.2.2/go.mod h1:sI3evg9Wvpw3+n4SqplGSJUMwtDeROfD4nsFz4z9PG0=
-github.com/zarf-dev/zarf v0.38.3 h1:XSNBh5juPyPHeSDlaWgUGn5m7Jm6g7LIeTQOOUKvdC0=
-github.com/zarf-dev/zarf v0.38.3/go.mod h1:KAsR0Ppj4JcP4YOSH/mxd5dIM/95nUMvUNk6oVC3D4c=
+github.com/zarf-dev/zarf v0.39.0 h1:pWcYHITUtKDdRoNKZCSpOtQMj5g32XgQmq2x2kqmgWI=
+github.com/zarf-dev/zarf v0.39.0/go.mod h1:heZFZKR4G+ap+B5fLBVRitQ516rMH5zHWoO4Eh2KcEk=
 github.com/zclconf/go-cty v1.14.0 h1:/Xrd39K7DXbHzlisFP9c4pHao4yyf+/Ug9LEz+Y/yhc=
 github.com/zclconf/go-cty v1.14.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=

diff --git a/hack/generate-schema.sh b/hack/generate-schema.sh
@@ -30,4 +30,4 @@ awk '{gsub(/\[github\.com\/defenseunicorns\/maru-runner\/src\/pkg\/variables\.Ex
 mv temp_tasks.schema.json tasks.schema.json
 
 # Download the Zarf schema
-curl -O https://raw.githubusercontent.com/zarf-dev/zarf/v0.38.3/zarf.schema.json
+curl -O https://raw.githubusercontent.com/zarf-dev/zarf/v0.39.0/zarf.schema.json
diff --git a/src/test/bundles/04-init/uds-bundle.yaml b/src/test/bundles/04-init/uds-bundle.yaml
@@ -10,12 +10,12 @@ packages:
   - name: init
     path: "../../packages"
     # renovate: datasource=github-tags depName=zarf-dev/zarf
-    ref: v0.38.3
+    ref: v0.39.0
     optionalComponents:
       - git-server
   - name: init
     repository: ghcr.io/zarf-dev/packages/init
     # renovate: datasource=github-tags depName=zarf-dev/zarf
-    ref: v0.38.3
+    ref: v0.39.0
     optionalComponents:
       - git-server
diff --git a/src/test/bundles/14-optional-components/uds-bundle.yaml b/src/test/bundles/14-optional-components/uds-bundle.yaml
@@ -8,7 +8,7 @@ packages:
   - name: init
     repository: ghcr.io/zarf-dev/packages/init
     # renovate: datasource=github-tags depName=zarf-dev/zarf
-    ref: v0.38.3
+    ref: v0.39.0
 
   # deploys prometheus as a required component and upload-image as an optional component (with noOptionalComponents key)
   - name: prometheus

diff --git a/zarf.schema.json b/zarf.schema.json
@@ -169,6 +169,38 @@
         "^x-": {}
       }
     },
+    "NamespacedObjectKindReference": {
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "description": "API Version of the resource"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of the resource"
+        },
+        "namespace": {
+          "type": "string",
+          "description": "Namespace of the resource"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the resource"
+        }
+      },
+      "additionalProperties": false,
+      "type": "object",
+      "required": [
+        "apiVersion",
+        "kind",
+        "namespace",
+        "name"
+      ],
+      "description": "NamespacedObjectKindReference is a reference to a specific resource in a namespace using its kind and API version.",
+      "patternProperties": {
+        "^x-": {}
+      }
+    },
     "Shell": {
       "properties": {
         "windows": {
@@ -512,6 +544,13 @@
         "actions": {
           "$ref": "#/$defs/ZarfComponentActions",
           "description": "Custom commands to run at various stages of a package lifecycle."
+        },
+        "healthChecks": {
+          "items": {
+            "$ref": "#/$defs/NamespacedObjectKindReference"
+          },
+          "type": "array",
+          "description": "List of resources to health check after deployment"
         }
       },
       "additionalProperties": false,