Merge pull request #152 from tdakkota/feat/treat-some-any-of-as-sum

feat(gen): handle anyOf which can be represent by type sum
ogen-go · Feb 3, 2022 · d3f85ed · d3f85ed
2 parents eb5784c + e593f56
commit d3f85ed
Show file tree

Hide file tree

Showing 14 changed files with 939 additions and 368 deletions.
diff --git a/_testdata/sample.json b/_testdata/sample.json
@@ -927,6 +927,9 @@
           "testAny": {
             "$ref": "#/components/schemas/AnyTest"
           },
+          "testAnyOf": {
+            "$ref": "#/components/schemas/AnyOfTest"
+          },
           "testDate": {
             "type": "string",
             "format": "date"
@@ -1060,6 +1063,31 @@
           }
         ]
       },
+      "AnyOfTest": {
+        "description": "Type for testing some anyOf cases from Jaeger operator API schema",
+        "required": [
+          "medium",
+          "sizeLimit"
+        ],
+        "properties": {
+          "medium": {
+            "type": "string"
+          },
+          "sizeLimit": {
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string"
+              }
+            ],
+            "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+            "x-kubernetes-int-or-string": true
+          }
+        },
+        "type": "object"
+      },
       "OneVariantHasNoUniqueFields": {
         "oneOf": [
           {
@@ -1123,6 +1151,7 @@
         "properties": {
           "empty": {},
           "any_map": {
+            "type": "object",
             "additionalProperties": true
           },
           "any_array": {