Update swagger and proto-wire#232
Open
JonathanLorimer wants to merge 4 commits intoawakesecurity:masterfrom
Open
Update swagger and proto-wire#232JonathanLorimer wants to merge 4 commits intoawakesecurity:masterfrom
JonathanLorimer wants to merge 4 commits intoawakesecurity:masterfrom
Conversation
JonathanLorimer
commented
Apr 14, 2023
Comment on lines
+69
to
+78
| "{\"properties\":{\"wrapper\":{\"format\":\"int64\",\"maximum\":9223372036854775807,\"minimum\":-9223372036854775808,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| , expectSchema @TestProtoWrappers.TestUInt64Value | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":18446744073709551615,\"format\":\"UInt64Value\",\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":18446744073709551615,\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"format\":\"int64\",\"maximum\":18446744073709551615,\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| , expectSchema @TestProtoWrappers.TestInt32Value | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":2147483647,\"format\":\"Int32Value\",\"minimum\":-2147483648,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":2147483647,\"format\":\"int32\",\"minimum\":-2147483648,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"format\":\"int32\",\"maximum\":2147483647,\"minimum\":-2147483648,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| , expectSchema @TestProtoWrappers.TestUInt32Value | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":4294967295,\"format\":\"UInt32Value\",\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"maximum\":4294967295,\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" | ||
| "{\"properties\":{\"wrapper\":{\"format\":\"int32\",\"maximum\":4294967295,\"minimum\":0,\"type\":\"integer\"}},\"type\":\"object\"}" |
Author
There was a problem hiding this comment.
New swagger seems to sort keys alphabetically now.
Comment on lines
-18
to
-21
| instance Arbitrary TS.ShortText where | ||
| arbitrary = fmap TS.fromText arbitrary | ||
| shrink = map TS.fromText . shrink . TS.toText | ||
|
|
Author
There was a problem hiding this comment.
Arbitrary instance for ShortText already provided by quickcheck-instances, this is the reason I increased the lower bound on that dep.
proto3-suite.cabal
Outdated
| if flag(large-records) | ||
| -- large-records support uses newer Dhall APIs. So we need at least 1.34. | ||
| build-depends: dhall >=1.34 && < 1.39, | ||
| build-depends: dhall >=1.34 && < 1.41.2, |
Author
There was a problem hiding this comment.
swagger2 >= 2.8 requires aeson 2, this conflicted with dhall <1.39 which requires pre-2 aeson. Bumped the upper bound to allow the solver to grab aeson 2.
Comment on lines
+1
to
+5
| packages: ./*.cabal | ||
| source-repository-package | ||
| type: git | ||
| location: https://github.com/awakesecurity/proto3-wire | ||
| tag: 8096a1e19431af603655e5c1f2488b5db907836c |
Author
There was a problem hiding this comment.
Stack was already using a commit pin for proto3-wire, added one for cabal. Also updated the pin in stack (this provides a Data instance for FieldNumber)
Author
|
@riz0id Could I get a review when you have a moment? |
ixmatus
approved these changes
Apr 24, 2023
Collaborator
ixmatus
left a comment
ixmatus
left a comment
There was a problem hiding this comment.
@JonathanLorimer thanks for the PR. Sorry it took so long to get around to reviewing it.
Collaborator
|
@JonathanLorimer it looks like there's a CI failure: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This update makes proto3-suite work as part of haskellPackages in unstable nixpkgs.