From ecb5c209876cc0de3ca6f478a8745e23a2e270af Mon Sep 17 00:00:00 2001 From: solimant Date: Mon, 2 Dec 2024 15:34:21 +0000 Subject: [PATCH] Remove UserEntity model Signed-off-by: solimant --- .../catalog-backend/src/schema/openapi.yaml | 36 ------------------- .../src/schema/openapi.yaml | 4 ++- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/plugins/catalog-backend/src/schema/openapi.yaml b/plugins/catalog-backend/src/schema/openapi.yaml index 25b5befa87..baaba44d48 100644 --- a/plugins/catalog-backend/src/schema/openapi.yaml +++ b/plugins/catalog-backend/src/schema/openapi.yaml @@ -815,42 +815,6 @@ components: - totalItems - pageInfo additionalProperties: false - UserEntity: - $ref: '#/components/schemas/UserEntityV1alpha1' - UserEntityV1alpha1: - allOf: - - $ref: '#/components/schemas/Entity' - - type: object - properties: - apiVersion: - type: string - enum: - - 'backstage.io/v1alpha1' - - 'backstage.io/v1beta1' - kind: - type: string - enum: - - 'User' - spec: - type: object - properties: - profile: - type: object - properties: - displayName: - type: string - email: - type: string - picture: - type: string - memberOf: - type: array - items: - type: string - required: - - apiVersion - - kind - description: Backstage catalog User kind Entity. securitySchemes: JWT: type: http diff --git a/plugins/scaffolder-backend/src/schema/openapi.yaml b/plugins/scaffolder-backend/src/schema/openapi.yaml index ff57991b5c..26253d404f 100644 --- a/plugins/scaffolder-backend/src/schema/openapi.yaml +++ b/plugins/scaffolder-backend/src/schema/openapi.yaml @@ -514,8 +514,10 @@ components: type: object properties: entity: - $ref: '../../../catalog-backend/src/schema/openapi.yaml#/components/schemas/UserEntity' + type: object + properties: {} description: The decorated entity from the Catalog + additionalProperties: {} ref: type: string description: An entity ref for the author of the task