From 759ba30501c6e4cfc41032fd67ffa2befce352f6 Mon Sep 17 00:00:00 2001
From: Aramis Sennyey <sennyeya@amazon.com>
Date: Tue, 14 Mar 2023 15:45:16 -0400
Subject: [PATCH] Update schema to get rid of nullable which isn't valid 3.1.

Signed-off-by: Aramis Sennyey <sennyeya@amazon.com>
---
 plugins/catalog-backend/openapi.yaml      | 7 ++++---
 plugins/catalog-backend/schema/openapi.ts | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/catalog-backend/openapi.yaml b/plugins/catalog-backend/openapi.yaml
index ecab6c7272..32f0e04e58 100644
--- a/plugins/catalog-backend/openapi.yaml
+++ b/plugins/catalog-backend/openapi.yaml
@@ -257,7 +257,7 @@ components:
           items:
             allOf:
               - $ref: '#/components/schemas/Entity'
-            nullable: true
+              - type: 'null'
           description: |-
             The list of entities, in the same order as the refs in the request. Entries
             that are null signify that no entity existed with that ref.
@@ -455,8 +455,9 @@ components:
             field empty; which would currently make it owned by X" where X is taken from the
             codeowners file.
         value:
-          type: string
-          nullable: true
+          type:
+            - string
+            - 'null'
         state:
           type: string
           enum:
diff --git a/plugins/catalog-backend/schema/openapi.ts b/plugins/catalog-backend/schema/openapi.ts
index e14410cd30..b7e2220b55 100644
--- a/plugins/catalog-backend/schema/openapi.ts
+++ b/plugins/catalog-backend/schema/openapi.ts
@@ -306,12 +306,14 @@ export default {
           items: {
             type: 'array',
             items: {
-              allOf: [
+              anyOf: [
                 {
                   $ref: '#/components/schemas/Entity',
                 },
+                {
+                  type: 'null',
+                },
               ],
-              nullable: true,
             },
             description:
               'The list of entities, in the same order as the refs in the request. Entries\nthat are null signify that no entity existed with that ref.',