From 133c827b96b10ff089f18d1db5a0348b01ad13e1 Mon Sep 17 00:00:00 2001 From: Annalise Diroff Date: Wed, 20 Apr 2022 13:37:48 -0700 Subject: [PATCH 1/3] Adding int64 to OAS --- sdk/framework/openapi.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/framework/openapi.go b/sdk/framework/openapi.go index 87240ecc85868..717a6505db175 100644 --- a/sdk/framework/openapi.go +++ b/sdk/framework/openapi.go @@ -613,6 +613,9 @@ func convertType(t FieldType) schemaType { ret.format = "lowercase" case TypeInt: ret.baseType = "integer" + case TypeInt64: + ret.baseType = "integer" + ret.format = "int64" case TypeDurationSecond, TypeSignedDurationSecond: ret.baseType = "integer" ret.format = "seconds" From 6b3c59432169a41eaaaa18d65ba71fbb9b940def Mon Sep 17 00:00:00 2001 From: Annalise Diroff Date: Wed, 20 Apr 2022 15:14:53 -0700 Subject: [PATCH 2/3] Changelog --- changelog/15104.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/15104.txt diff --git a/changelog/15104.txt b/changelog/15104.txt new file mode 100644 index 0000000000000..39ea1f577eb97 --- /dev/null +++ b/changelog/15104.txt @@ -0,0 +1,3 @@ +```release-note:bug +sdk: Fix OpenApi spec generator to properly convert TypeInt64 to OAS supported int64 +``` From a07f28afbde3d8d77695e1cb5f17c790a0e57e56 Mon Sep 17 00:00:00 2001 From: Annalise Diroff Date: Wed, 20 Apr 2022 16:08:56 -0700 Subject: [PATCH 3/3] Adding small test case --- sdk/framework/openapi_test.go | 4 ++++ sdk/framework/testdata/operations.json | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/sdk/framework/openapi_test.go b/sdk/framework/openapi_test.go index fa14d2eb88c8a..592406d9fb722 100644 --- a/sdk/framework/openapi_test.go +++ b/sdk/framework/openapi_test.go @@ -356,6 +356,10 @@ func TestOpenAPI_Paths(t *testing.T) { Description: "a header value", AllowedValues: []interface{}{"a", "b", "c"}, }, + "maximum": { + Type: TypeInt64, + Description: "a maximum value", + }, "format": { Type: TypeString, Description: "a query param", diff --git a/sdk/framework/testdata/operations.json b/sdk/framework/testdata/operations.json index 94d54087b62f2..097399c02e0e8 100644 --- a/sdk/framework/testdata/operations.json +++ b/sdk/framework/testdata/operations.json @@ -113,6 +113,11 @@ "type": "string", "description": "a header value", "enum": ["a", "b", "c"] + }, + "maximum" : { + "type": "integer", + "description": "a maximum value", + "format": "int64" } } }