Don't import maxLength on floats (#927)

anz-bank · Jul 10, 2024 · 1c6f5de · 1c6f5de
1 parent 9d2b831
commit 1c6f5de
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/internal/bundles/assets/import_openapi_cli.arraiz b/internal/bundles/assets/import_openapi_cli.arraiz
diff --git a/pkg/importer/openapi/openapi_to_sysl_proto.arrai b/pkg/importer/openapi/openapi_to_sysl_proto.arrai
@@ -228,10 +228,15 @@ let specialAnno = {
         let constraint =
             let c = (
                 length:
-                    let maxLength = t('maxLength')?:{};
-                    let minLength = t('minLength')?:{};
-                    cond {maxLength: ('max': maxLength), _: ()} +>
-                    cond {minLength: ('min': minLength), _: ()}
+                    cond {
+                    type = primitive('FLOAT'):
+                        (), # no length on a float
+                    _:
+                        let maxLength = t('maxLength')?:{};
+                        let minLength = t('minLength')?:{};
+                        cond {maxLength: ('max': maxLength), _: ()} +>
+                        cond {minLength: ('min': minLength), _: ()},
+                    }
                 ,
                 bit_width:
                     let format = intOrFloatRegex.sub('', t('format')?.s:{});

diff --git a/pkg/importer/tests/openapi3/min-max.sysl b/pkg/importer/tests/openapi3/min-max.sysl
@@ -40,3 +40,7 @@ TestApp "Simple":
             @json_tag = "i"
         j <: string(1..2)?:
             @json_tag = "j"
+        k <: float?:
+            @json_tag = "k"
+        l <: int(6)?:
+            @json_tag = "l"
diff --git a/pkg/importer/tests/openapi3/min-max.yaml b/pkg/importer/tests/openapi3/min-max.yaml
@@ -41,3 +41,9 @@ components:
           type: integer
         j:
           $ref: '#/components/schemas/toRefWithLength'
+        k:
+          type: number
+          maxLength: 6 # invalid, but sysl shouldn't crash
+        l:
+          type: integer
+          maxLength: 6 # invalid, but sysl shouldn't crash