fix: schema validator templates

Signed-off-by: peefy <[email protected]>
kcl-lang · Dec 5, 2023 · 2ea148b · 2ea148b
1 parent d8316c0
commit 2ea148b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...s/kube_resource/complex/muti_models/models/core_oam_dev_v1alpha2_containerized_workload.k b/...s/kube_resource/complex/muti_models/models/core_oam_dev_v1alpha2_containerized_workload.k
@@ -149,7 +149,7 @@ schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0EnvItems0:
 
 
     check:
-        regex.match(name, r"(^[-_a-zA-Z0-9]+$")
+        regex.match(str(name), r"^[-_a-zA-Z0-9]+$")
 
 
 schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0LivenessProbe:
@@ -285,7 +285,7 @@ schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0PortsItems0:
 
 
     check:
-        regex.match(name, r"(^[a-z]+$")
+        regex.match(str(name), r"^[a-z]+$")
 
 
 schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0ReadiessProbe:

diff --git a/...urce/generator/testdata/muti_models/models/core_oam_dev_v1alpha2_containerized_workload.k b/...urce/generator/testdata/muti_models/models/core_oam_dev_v1alpha2_containerized_workload.k
@@ -149,7 +149,7 @@ schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0EnvItems0:
 
 
     check:
-        regex.match(name, r"(^[-_a-zA-Z0-9]+$")
+        regex.match(str(name), r"^[-_a-zA-Z0-9]+$")
 
 
 schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0LivenessProbe:
@@ -285,7 +285,7 @@ schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0PortsItems0:
 
 
     check:
-        regex.match(name, r"(^[a-z]+$")
+        regex.match(str(name), r"^[a-z]+$")
 
 
 schema CoreOamDevV1alpha2ContainerizedWorkloadSpecContainersItems0ReadiessProbe:

diff --git a/pkg/swagger/generator/templates/schemavalidator.gotmpl b/pkg/swagger/generator/templates/schemavalidator.gotmpl
@@ -1,6 +1,6 @@
 {{- define "schemavalidator" -}}
 {{- range . -}}
-{{- if or .Required .Maximum .Minimum .MaxLength .MinLength .Pattern .UniqueItems .Enum }}
+{{- if or .Maximum .Minimum .MaxLength .MinLength .Pattern .UniqueItems .MinItems .MaxItems .MultipleOf }}
     {{- if .Maximum }}
         {{ if .ExclusiveMaximum }}{{ .EscapedName }} < {{.Maximum}}{{- else }}{{ .EscapedName }} <= {{.Maximum}}{{ end }}
     {{- end }}
@@ -14,7 +14,7 @@
         len({{ .EscapedName }}) >= {{.MinLength}}
     {{- end }}
     {{- if .Pattern }}
-        regex.match({{ .EscapedName }}, r"({{.Pattern}}"){{ if not .Required }} if {{ .EscapedName }}{{ end }}
+        regex.match(str({{ .EscapedName }}), r"{{.Pattern}}"){{ if not .Required }} if {{ .EscapedName }}{{ end }}
     {{- end }}
     {{- if .UniqueItems }}
         isunique({{ .EscapedName }})
@@ -25,6 +25,9 @@
     {{- if .MaxItems }}
         len({{ .EscapedName }}) <= {{ .MaxItems }}
     {{- end }}
+    {{- if .MultipleOf }}
+        multiplyof(int({{ .EscapedName }}), int({{ .MultipleOf }}))
+    {{- end }}
 {{- end -}}
 {{- end -}}
 {{- end -}}