From 350a07ae3468c3ce6d4ac98f114441eb106900af Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Wed, 30 Aug 2023 11:07:04 -0400 Subject: [PATCH 1/4] fix: Add order to OpenAPI spec for /entities endpoint. Signed-off-by: Aramis Sennyey --- .../catalog-backend/src/schema/openapi.generated.ts | 12 ++++++++++++ plugins/catalog-backend/src/schema/openapi.yaml | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/plugins/catalog-backend/src/schema/openapi.generated.ts b/plugins/catalog-backend/src/schema/openapi.generated.ts index 9af42325ea..35516ba0dc 100644 --- a/plugins/catalog-backend/src/schema/openapi.generated.ts +++ b/plugins/catalog-backend/src/schema/openapi.generated.ts @@ -788,6 +788,18 @@ export default { { $ref: '#/components/parameters/after', }, + { + name: 'order', + in: 'query', + allowReserved: true, + required: false, + schema: { + type: 'array', + item: { + type: 'string', + }, + }, + }, ], }, }, diff --git a/plugins/catalog-backend/src/schema/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml index 701b4517bc..2882f7c3be 100644 --- a/plugins/catalog-backend/src/schema/openapi.yaml +++ b/plugins/catalog-backend/src/schema/openapi.yaml @@ -650,6 +650,14 @@ paths: - $ref: '#/components/parameters/filter' - $ref: '#/components/parameters/offset' - $ref: '#/components/parameters/after' + - name: order + in: query + allowReserved: true + required: false + schema: + type: array + item: + type: string /entities/by-uid/{uid}: get: operationId: GetEntityByUid From 45947d3b275945dbe0be8ae423bd8600a20cb33b Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Wed, 30 Aug 2023 11:10:11 -0400 Subject: [PATCH 2/4] add changeset. Signed-off-by: Aramis Sennyey --- .changeset/poor-olives-own.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/poor-olives-own.md diff --git a/.changeset/poor-olives-own.md b/.changeset/poor-olives-own.md new file mode 100644 index 0000000000..6eb8b5ac2b --- /dev/null +++ b/.changeset/poor-olives-own.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Fixes an issue where `order` was not a recognized parameter for the `/entities` endpoint. From e9580ecedf42351a25d7eb311af9177b5cb65936 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Wed, 30 Aug 2023 11:39:58 -0400 Subject: [PATCH 3/4] fix schema typo Signed-off-by: Aramis Sennyey --- plugins/catalog-backend/src/schema/openapi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/catalog-backend/src/schema/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml index 2882f7c3be..151918029b 100644 --- a/plugins/catalog-backend/src/schema/openapi.yaml +++ b/plugins/catalog-backend/src/schema/openapi.yaml @@ -656,7 +656,7 @@ paths: required: false schema: type: array - item: + items: type: string /entities/by-uid/{uid}: get: From 2c89e9eda40989fb88bf4cb803c32107a947d153 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Wed, 30 Aug 2023 11:59:11 -0400 Subject: [PATCH 4/4] fix schema Signed-off-by: Aramis Sennyey --- plugins/catalog-backend/src/schema/openapi.generated.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/catalog-backend/src/schema/openapi.generated.ts b/plugins/catalog-backend/src/schema/openapi.generated.ts index 35516ba0dc..010b5a0c5b 100644 --- a/plugins/catalog-backend/src/schema/openapi.generated.ts +++ b/plugins/catalog-backend/src/schema/openapi.generated.ts @@ -795,7 +795,7 @@ export default { required: false, schema: { type: 'array', - item: { + items: { type: 'string', }, },