set min/maxItems and min/maxProperties when generating openapi

Signed-off-by: Dmitriy Kalinin <[email protected]>
carvel-dev · Apr 14, 2024 · 43dee5f · 43dee5f
1 parent eacb7bc
commit 43dee5f
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 4 deletions.
diff --git a/pkg/cmd/template/schema_inspect_test.go b/pkg/cmd/template/schema_inspect_test.go
@@ -567,6 +567,13 @@ foo:
   #@schema/validation min_len=1, max_len=10
   string_key: ""
 
+  #@schema/validation min_len=3, max_len=4
+  array_key:
+  - ""
+
+  #@schema/validation min_len=2, max_len=5
+  map_key: {}
+
   #@schema/validation one_of=[1,2,3]
   one_of_integers: 1
 
@@ -616,6 +623,20 @@ components:
               default: ""
               minLength: 1
               maxLength: 10
+            array_key:
+              type: array
+              items:
+                type: string
+                default: ""
+              default: []
+              minItems: 3
+              maxItems: 4
+            map_key:
+              type: object
+              additionalProperties: false
+              properties: {}
+              minProperties: 2
+              maxProperties: 5
             one_of_integers:
               type: integer
               default: 1

diff --git a/pkg/schema/openapi.go b/pkg/schema/openapi.go
@@ -26,8 +26,12 @@ const (
 	defaultProp            = "default"
 	minProp                = "minimum"
 	maxProp                = "maximum"
-	minLenProp             = "minLength"
+	minLenProp             = "minLength" // for strings
 	maxLenProp             = "maxLength"
+	minItemsProp           = "minItems" // for arrays
+	maxItemsProp           = "maxItems"
+	minPropertiesProp      = "minProperties" // for objects
+	maxPropertiesProp      = "maxProperties"
 	enumProp               = "enum"
 )
 
@@ -48,7 +52,11 @@ var propOrder = map[string]int{
 	maxProp:                13,
 	minLenProp:             14,
 	maxLenProp:             15,
-	enumProp:               16,
+	minItemsProp:           16,
+	maxItemsProp:           17,
+	minPropertiesProp:      18,
+	maxPropertiesProp:      19,
+	enumProp:               20,
 }
 
 type openAPIKeys []*yamlmeta.MapItem
@@ -206,10 +214,30 @@ func convertValidations(schemaVal Type) []*yamlmeta.MapItem {
 	var items []*yamlmeta.MapItem
 
 	if value, found := validation.HasSimpleMinLength(); found {
-		items = append(items, &yamlmeta.MapItem{Key: minLenProp, Value: value})
+		containedValue := schemaVal.GetValueType()
+		switch containedValue.(type) {
+		case *ArrayType:
+			items = append(items, &yamlmeta.MapItem{Key: minItemsProp, Value: value})
+		case *MapType:
+			items = append(items, &yamlmeta.MapItem{Key: minPropertiesProp, Value: value})
+		default:
+			if containedValue.String() == "string" {
+				items = append(items, &yamlmeta.MapItem{Key: minLenProp, Value: value})
+			}
+		}
 	}
 	if value, found := validation.HasSimpleMaxLength(); found {
-		items = append(items, &yamlmeta.MapItem{Key: maxLenProp, Value: value})
+		containedValue := schemaVal.GetValueType()
+		switch containedValue.(type) {
+		case *ArrayType:
+			items = append(items, &yamlmeta.MapItem{Key: maxItemsProp, Value: value})
+		case *MapType:
+			items = append(items, &yamlmeta.MapItem{Key: maxPropertiesProp, Value: value})
+		default:
+			if containedValue.String() == "string" {
+				items = append(items, &yamlmeta.MapItem{Key: maxLenProp, Value: value})
+			}
+		}
 	}
 	if value, found := validation.HasSimpleMin(); found {
 		items = append(items, &yamlmeta.MapItem{Key: minProp, Value: value})