Fix validation for disks (#235)

The "valid" JSON path has to point to the "bus" field, because "disk" field always exists, even if it is "nil". Signed-off-by: Andrej Krejcir <[email protected]>
kubevirt · Sep 30, 2020 · 36a7aff · 36a7aff
1 parent f137a74
commit 36a7aff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/templates/VALIDATION.md b/templates/VALIDATION.md
@@ -290,7 +290,7 @@ kind: Template
         [
           {
             "name": "supported-bus",
-            "valid": "jsonpath::.spec.domain.devices.disks[*].disk",
+            "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
             "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
             "rule": "enum",
             "message": "the disk bus type must be one of the supported values",
@@ -333,7 +333,7 @@ kind: Template
         [
           {
             "name": "supported-bus",
-            "valid": "jsonpath::.spec.domain.devices.disks[*].disk",
+            "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
             "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
             "rule": "enum",
             "message": "the disk bus type must be one of the supported values",

diff --git a/templates/win2k12r2-deprecated.tpl.yaml b/templates/win2k12r2-deprecated.tpl.yaml
@@ -41,15 +41,15 @@ metadata:
         }, {
           "name": "windows-virtio-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "virto disk bus type has better performance, install virtio drivers in VM and change bus type",
           "values": ["virtio"],
           "justWarning": true
         }, {
           "name": "windows-disk-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "disk bus has to be either virtio or sata",
           "values": ["virtio", "sata"]

diff --git a/templates/windows.tpl.yaml b/templates/windows.tpl.yaml
@@ -40,15 +40,15 @@ metadata:
         }, {
           "name": "windows-virtio-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "virto disk bus type has better performance, install virtio drivers in VM and change bus type",
           "values": ["virtio"],
           "justWarning": true
         }, {
           "name": "windows-disk-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "disk bus has to be either virtio or sata",
           "values": ["virtio", "sata"]

diff --git a/templates/windows10.tpl.yaml b/templates/windows10.tpl.yaml
@@ -38,15 +38,15 @@ metadata:
         }, {
           "name": "windows-virtio-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "virto disk bus type has better performance, install virtio drivers in VM and change bus type",
           "values": ["virtio"],
           "justWarning": true
         }, {
           "name": "windows-disk-bus",
           "path": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
-          "valid": "jsonpath::.spec.domain.devices.disks[*]",
+          "valid": "jsonpath::.spec.domain.devices.disks[*].disk.bus",
           "rule": "enum",
           "message": "disk bus has to be either virtio or sata",
           "values": ["virtio", "sata"]