Add VHost properties to AMQP definitions (#7)

swaggest · Aug 10, 2020 · 943feb3 · 943feb3
1 parent 2b91b2b
commit 943feb3
Show file tree

Hide file tree

Showing 5 changed files with 3,920 additions and 956 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,9 @@
 GOLANGCI_LINT_VERSION := "v1.27.0"
+JSON_CLI_VERSION := "v1.6.7"
 
 gen-2.0.0:
-	cd resources/schema/ && json-cli gen-go asyncapi-2.0.0.json --output ../../spec-2.0.0/entities.go --fluent-setters --package-name spec --root-name AsyncAPI
+	@test -s $(GOPATH)/bin/json-cli-$(JSON_CLI_VERSION) || (curl -sSfL https://github.com/swaggest/json-cli/releases/download/$(JSON_CLI_VERSION)/json-cli -o $(GOPATH)/bin/json-cli-$(JSON_CLI_VERSION) && chmod +x $(GOPATH)/bin/json-cli-$(JSON_CLI_VERSION))
+	cd resources/schema/ && $(GOPATH)/bin/json-cli-$(JSON_CLI_VERSION) gen-go asyncapi-2.0.0.json --output ../../spec-2.0.0/entities.go --fluent-setters --package-name spec --root-name AsyncAPI
 	gofmt -w ./spec-2.0.0/entities.go
 
 gen-1.2.0:

diff --git a/go.mod b/go.mod
@@ -4,9 +4,8 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.5.1
 	github.com/swaggest/assertjson v1.0.0
-	github.com/swaggest/jsonschema-go v0.3.5
-	github.com/swaggest/openapi-go v0.1.10 // indirect
-	github.com/swaggest/swgen v0.6.25
+	github.com/swaggest/jsonschema-go v0.3.6
+	github.com/swaggest/swgen v0.6.26
 	gopkg.in/yaml.v2 v2.3.0
 )
 

diff --git a/go.sum b/go.sum
@@ -62,12 +62,16 @@ github.com/swaggest/jsonschema-go v0.3.4 h1:VoD8ux21OyoSPvRHbWNE1I5SQZ6T6L+WLd2G
 github.com/swaggest/jsonschema-go v0.3.4/go.mod h1:TrWgbug4p2ZgcxnHDz+CvYvEtJ5KckL/XOV4mSR6FGw=
 github.com/swaggest/jsonschema-go v0.3.5 h1:zOUyPaLfoqgoPB/HnaM3rApLD/nT/BrzZhDeZj9yVUY=
 github.com/swaggest/jsonschema-go v0.3.5/go.mod h1:TrWgbug4p2ZgcxnHDz+CvYvEtJ5KckL/XOV4mSR6FGw=
+github.com/swaggest/jsonschema-go v0.3.6 h1:fqRQuCX377UnEfAaTwwhaDYchW7y1SnXU1SCihetfKI=
+github.com/swaggest/jsonschema-go v0.3.6/go.mod h1:TrWgbug4p2ZgcxnHDz+CvYvEtJ5KckL/XOV4mSR6FGw=
 github.com/swaggest/openapi-go v0.1.3 h1:IyFhFIFDW9L61z/ez9zLI+v39dP8N8HurAGr6msRWPM=
 github.com/swaggest/openapi-go v0.1.3/go.mod h1:Zx4ZgJ7XvlFH9wCOHE7u8RAjLfiHAnCHeaD5kUDujVM=
 github.com/swaggest/openapi-go v0.1.9 h1:U8vXeBgkvgZS+fN4pPxPQg6cd03cyEVh9Tcm4Oxl/7U=
 github.com/swaggest/openapi-go v0.1.9/go.mod h1:QWUgJ7+yxsUuGDsmJgJB7kmo8glIpAJKToaRZcZ0ihU=
 github.com/swaggest/openapi-go v0.1.10 h1:3NnJrfhaWLOdfb3Co/etIDC739mYgXg7OANIiWzXjeA=
 github.com/swaggest/openapi-go v0.1.10/go.mod h1:dpYR9uHkl3g2PNcrkpXjAoV2azKWQPoRQpgB3bnF2xc=
+github.com/swaggest/openapi-go v0.1.11 h1:3CREFp+xfWOlibWVD2b/ljCJwKoMGosa+BBeTlHd1MA=
+github.com/swaggest/openapi-go v0.1.11/go.mod h1:hkkUtT0DXtBbcpWuEGH7vrycGTXtvxVySuv8fiV8ghs=
 github.com/swaggest/refl v0.1.0 h1:mz3skba8ewcPmxDryM9rETv4fSuAX4GqNxTuDfPyUM0=
 github.com/swaggest/refl v0.1.0/go.mod h1:kmYWhxNEvjfRDdMRqpaR/vLULk/SotJs9HFUCIVMK8o=
 github.com/swaggest/refl v0.1.2 h1:BfxmzI4FabeaSHijDEObFB1qaDPevcDsRetAYxg30yw=
@@ -78,6 +82,8 @@ github.com/swaggest/swgen v0.6.20/go.mod h1:ipkZNfwztgRfbOWUllLZawfmxXprT8flqNJO
 github.com/swaggest/swgen v0.6.23/go.mod h1:gj2yCLONy3kosKjwRtQeT5O9qqlhUvXAiDnbVwBUNFM=
 github.com/swaggest/swgen v0.6.25 h1:tAQEOL2Wp1Xe79txkjwvZLomzy7d/CvAqwBgo0D3TAM=
 github.com/swaggest/swgen v0.6.25/go.mod h1:Vw3THaawXG1gZeu5VqQ3LVi6ei0nx4EOBZBAuotS6t0=
+github.com/swaggest/swgen v0.6.26 h1:QRbtk30w5r2zaw1200uEUdhWGPhyg3DgU1vQ76RbNAc=
+github.com/swaggest/swgen v0.6.26/go.mod h1:Q8K9sWsSVL2bf6MJyjYrJiigZU4SOADsHO9IgltSIwg=
 github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=

diff --git a/resources/schema/amqp-channel-binding-object-0.1.0.json b/resources/schema/amqp-channel-binding-object-0.1.0.json
@@ -90,6 +90,10 @@
         "autoDelete": {
           "description": "Whether the exchange should be deleted when the last queue is unbound from it.",
           "type": "boolean"
+        },
+        "vhost": {
+          "description": "The virtual host of the queue. Defaults to /.",
+          "type": "string"
         }
       }
     },
@@ -113,6 +117,10 @@
         "autoDelete": {
           "description": "Whether the queue should be deleted when the last consumer unsubscribes.",
           "type": "boolean"
+        },
+        "vhost": {
+          "description": "The virtual host of the queue. Defaults to /.",
+          "type": "string"
         }
       }
     }