From 8c54638e24bee980eab6a642d4bdeeacc298ee4b Mon Sep 17 00:00:00 2001 From: Regan Laitila Date: Wed, 16 Mar 2022 22:15:41 -0400 Subject: [PATCH 1/5] adds 'any' reftype to operation parseObjectSchema --- .3383343147 | 2 ++ operation.go | 2 ++ operation_test.go | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 .3383343147 diff --git a/.3383343147 b/.3383343147 new file mode 100644 index 000000000..f8ab67337 --- /dev/null +++ b/.3383343147 @@ -0,0 +1,2 @@ +package main +import () \ No newline at end of file diff --git a/operation.go b/operation.go index 3adbd9dd3..3ec3e8e84 100644 --- a/operation.go +++ b/operation.go @@ -754,6 +754,8 @@ func (operation *Operation) parseObjectSchema(refType string, astFile *ast.File) return nil, nil case refType == "interface{}": return PrimitiveSchema(OBJECT), nil + case refType == "any": + return PrimitiveSchema(OBJECT), nil case IsGolangPrimitiveType(refType): refType = TransToValidSchemeType(refType) diff --git a/operation_test.go b/operation_test.go index 98f224cfa..e9e43e8c8 100644 --- a/operation_test.go +++ b/operation_test.go @@ -2269,6 +2269,10 @@ func TestParseObjectSchema(t *testing.T) { assert.NoError(t, err) assert.Equal(t, schema, PrimitiveSchema(OBJECT)) + schema, err = operation.parseObjectSchema("any", nil) + assert.NoError(t, err) + assert.Equal(t, schema, PrimitiveSchema(OBJECT)) + schema, err = operation.parseObjectSchema("int", nil) assert.NoError(t, err) assert.Equal(t, schema, PrimitiveSchema(INTEGER)) From d2ce216116282f565e8e99d4b64d6bf03555b5de Mon Sep 17 00:00:00 2001 From: Regan Laitila Date: Wed, 16 Mar 2022 22:39:44 -0400 Subject: [PATCH 2/5] adds 'any' to operation object schema parsing (#1162) --- operation.go | 4 +++- operation_test.go | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/operation.go b/operation.go index 3adbd9dd3..66d7ca5b9 100644 --- a/operation.go +++ b/operation.go @@ -754,6 +754,8 @@ func (operation *Operation) parseObjectSchema(refType string, astFile *ast.File) return nil, nil case refType == "interface{}": return PrimitiveSchema(OBJECT), nil + case refType == "any": + return PrimitiveSchema(OBJECT), nil case IsGolangPrimitiveType(refType): refType = TransToValidSchemeType(refType) @@ -774,7 +776,7 @@ func (operation *Operation) parseObjectSchema(refType string, astFile *ast.File) return nil, fmt.Errorf("invalid type: %s", refType) } refType = refType[idx+1:] - if refType == "interface{}" { + if refType == "interface{}" || refType == "any" { return spec.MapProperty(nil), nil } schema, err := operation.parseObjectSchema(refType, astFile) diff --git a/operation_test.go b/operation_test.go index 98f224cfa..e9e43e8c8 100644 --- a/operation_test.go +++ b/operation_test.go @@ -2269,6 +2269,10 @@ func TestParseObjectSchema(t *testing.T) { assert.NoError(t, err) assert.Equal(t, schema, PrimitiveSchema(OBJECT)) + schema, err = operation.parseObjectSchema("any", nil) + assert.NoError(t, err) + assert.Equal(t, schema, PrimitiveSchema(OBJECT)) + schema, err = operation.parseObjectSchema("int", nil) assert.NoError(t, err) assert.Equal(t, schema, PrimitiveSchema(INTEGER)) From 2552c4092e63d68deeb567a86b385490270400f2 Mon Sep 17 00:00:00 2001 From: Regan Laitila Date: Wed, 16 Mar 2022 22:41:44 -0400 Subject: [PATCH 3/5] bump go.mod to 1.18 (#1162) --- go.mod | 2 +- go.sum | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 8db0956e9..bcd3d2e65 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/swaggo/swag -go 1.17 +go 1.18 require ( github.com/KyleBanks/depth v1.2.1 diff --git a/go.sum b/go.sum index 4d899a342..8cf267760 100644 --- a/go.sum +++ b/go.sum @@ -62,24 +62,15 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -89,13 +80,9 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= From 6d3d4c96d30bfc34d588a560c8944b470e0c40b6 Mon Sep 17 00:00:00 2001 From: Regan Laitila Date: Wed, 16 Mar 2022 23:07:52 -0400 Subject: [PATCH 4/5] adds 'any' to primitive types as adhoc fix (#1162) --- schema.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/schema.go b/schema.go index 8f25d6f7d..0e72f65d7 100644 --- a/schema.go +++ b/schema.go @@ -104,7 +104,8 @@ func IsGolangPrimitiveType(typeName string) bool { "float32", "float64", "bool", - "string": + "string", + "any": return true } From 6269dae6d45496969abf188133d225e70bb7e1d2 Mon Sep 17 00:00:00 2001 From: Kalle Fagerberg Date: Wed, 30 Mar 2022 09:49:22 +0200 Subject: [PATCH 5/5] Removed .3383343147 --- .3383343147 | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .3383343147 diff --git a/.3383343147 b/.3383343147 deleted file mode 100644 index f8ab67337..000000000 --- a/.3383343147 +++ /dev/null @@ -1,2 +0,0 @@ -package main -import () \ No newline at end of file