From 941ee24074437dc2131908c92fdefab8a6213577 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 6 Feb 2024 18:49:50 +0000 Subject: [PATCH 1/2] chore(hackage): index-state: 2024-02-06T00:00:00Z Signed-off-by: Drew Hess --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 091b5a9c3..89c8f8f6a 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: 2023-10-09T00:00:00Z +index-state: 2024-02-06T00:00:00Z packages: primer From 32975be2c4d07ca1c2dd9865bdfdaf4259a77557 Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Tue, 6 Feb 2024 22:09:03 +0000 Subject: [PATCH 2/2] fix(primer-service): update OpenAPI golden test output The previous commit bumped the `openapi3` package to version `3.2.4`, which contains this pull request: https://github.com/biocad/openapi3/pull/88 The title of that PR is simply, "Give title to sub-schemas of oneOf for sum types", and that is what has happened here to our golden test output. Unhelpfully, there's no justification for why this change was made, but it looks harmless enough. (This will presumably require a corresponding schema change on the client side, though.) We also bump the PVP for `openapi3` to reflect the new minimum version requirement. Signed-off-by: Drew Hess --- primer-service/primer-service.cabal | 2 +- .../test/outputs/OpenAPI/openapi.json | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/primer-service/primer-service.cabal b/primer-service/primer-service.cabal index d6d8734ba..bf49be281 100644 --- a/primer-service/primer-service.cabal +++ b/primer-service/primer-service.cabal @@ -51,7 +51,7 @@ library , insert-ordered-containers ^>=0.2.5.1 , logging-effect ^>=1.4 , mtl >=2.2.2 && <2.4.0 - , openapi3 >=3.2 && <3.3.0 + , openapi3 ^>=3.2.4 , optics >=0.4 && <0.5.0 , primer ^>=0.7.2 , primer-api ^>=0.7.2 diff --git a/primer-service/test/outputs/OpenAPI/openapi.json b/primer-service/test/outputs/OpenAPI/openapi.json index 70364e4d9..1ced3c85a 100644 --- a/primer-service/test/outputs/OpenAPI/openapi.json +++ b/primer-service/test/outputs/OpenAPI/openapi.json @@ -19,6 +19,7 @@ "tag", "contents" ], + "title": "NoInput", "type": "object" }, { @@ -37,6 +38,7 @@ "tag", "contents" ], + "title": "Input", "type": "object" } ] @@ -154,6 +156,7 @@ "tag", "contents" ], + "title": "EvalFullRespTimedOut", "type": "object" }, { @@ -172,6 +175,7 @@ "tag", "contents" ], + "title": "EvalFullRespNormal", "type": "object" } ] @@ -365,6 +369,7 @@ "tag", "contents" ], + "title": "TextBody", "type": "object" }, { @@ -383,6 +388,7 @@ "tag", "contents" ], + "title": "PrimBody", "type": "object" }, { @@ -401,6 +407,7 @@ "tag", "contents" ], + "title": "BoxBody", "type": "object" }, { @@ -419,6 +426,7 @@ "tag", "contents" ], + "title": "NoBody", "type": "object" } ] @@ -518,6 +526,7 @@ "tag", "contents" ], + "title": "Ok", "type": "object" }, { @@ -540,6 +549,7 @@ "got", "tag" ], + "title": "Mismatch", "type": "object" } ] @@ -676,6 +686,7 @@ "tag", "contents" ], + "title": "PrimChar", "type": "object" }, { @@ -694,6 +705,7 @@ "tag", "contents" ], + "title": "PrimInt", "type": "object" }, { @@ -712,6 +724,7 @@ "tag", "contents" ], + "title": "PrimAnimation", "type": "object" } ] @@ -819,6 +832,7 @@ "tag", "contents" ], + "title": "SelectionDef", "type": "object" }, { @@ -837,6 +851,7 @@ "tag", "contents" ], + "title": "SelectionTypeDef", "type": "object" } ] @@ -970,6 +985,7 @@ "tag", "contents" ], + "title": "TypeDefParamNodeSelection", "type": "object" }, { @@ -988,6 +1004,7 @@ "tag", "contents" ], + "title": "TypeDefConsNodeSelection", "type": "object" } ] @@ -1040,6 +1057,7 @@ "tag", "contents" ], + "title": "Type", "type": "object" }, { @@ -1058,6 +1076,7 @@ "tag", "contents" ], + "title": "Kind", "type": "object" } ]