Revert "[OAS] Include alerting rule APIs (#189962)"

This reverts commit b85b1cb.

.buildkite/scripts/steps/capture_oas_snapshot.sh

@@ -5,7 +5,7 @@ set -euo pipefail
 source .buildkite/scripts/common/util.sh
 
 echo --- Capture OAS snapshot
-cmd="node scripts/capture_oas_snapshot --include-path /api/status --include-path /api/alerting/rule/ --include-path /api/alerting/rules"
+cmd="node scripts/capture_oas_snapshot --include-path /api/status"
 if is_pr && ! is_auto_commit_disabled; then
   cmd="$cmd --update"
 fi

packages/kbn-router-to-openapispec/src/generate_oas.test.fixture.ts

@@ -33,7 +33,7 @@ export const sharedOas = {
     '/bar': {
       get: {
         deprecated: true,
-        operationId: '%2Fbar#0',
+        operationId: '/bar#0',
         parameters: [
           {
             description: 'The version of the API to use',
@@ -152,7 +152,7 @@ export const sharedOas = {
     '/foo/{id}/{path*}': {
       get: {
         description: 'route description',
-        operationId: '%2Ffoo%2F%7Bid%7D%2F%7Bpath*%7D#0',
+        operationId: '/foo/{id}/{path*}#0',
         parameters: [
           {
             description: 'The version of the API to use',
@@ -276,7 +276,7 @@ export const sharedOas = {
       },
       post: {
         description: 'route description',
-        operationId: '%2Ffoo%2F%7Bid%7D%2F%7Bpath*%7D#1',
+        operationId: '/foo/{id}/{path*}#1',
         parameters: [
           {
             description: 'The version of the API to use',

packages/kbn-router-to-openapispec/src/oas_converter/kbn_config_schema/post_process_mutations/mutations/enum.test.ts

@@ -110,39 +110,6 @@ describe('processEnum', () => {
         ],
       },
     },
-    {
-      name: 'correctly transforms schema.nullable inputs',
-      input: {
-        anyOf: [
-          {
-            description: 'test',
-            type: 'object',
-            properties: {
-              test: {
-                type: 'string',
-              },
-            },
-            required: ['test'],
-          },
-          {
-            enum: [],
-            nullable: true,
-            type: undefined,
-          },
-        ],
-      } as OpenAPIV3.SchemaObject,
-      expected: {
-        description: 'test',
-        type: 'object',
-        properties: {
-          test: {
-            type: 'string',
-          },
-        },
-        required: ['test'],
-        nullable: true,
-      },
-    },
   ])('$name', ({ input, expected }) => {
     processEnum(input);
     expect(input).toEqual(expected);

packages/kbn-router-to-openapispec/src/oas_converter/kbn_config_schema/post_process_mutations/mutations/enum.ts

@@ -9,38 +9,8 @@
 import type { OpenAPIV3 } from 'openapi-types';
 import { isReferenceObject } from '../../../common';
 
-/** Identify special case output of schema.nullable() */
-const isNullableOutput = (schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject) => {
-  return (
-    !isReferenceObject(schema) &&
-    Object.keys(schema).length === 3 &&
-    schema.enum?.length === 0 &&
-    schema.nullable === true &&
-    schema.type === undefined
-  );
-};
-
-/**
- * Handle special case output of schema.nullable()
- *
- * We go from:
- * { anyOf: [ { type: 'string' }, { nullable: true, enum: [] } ] }
- *
- * To:
- * { type: 'string', nullable: true }
- */
-const processNullableOutput = (schema: OpenAPIV3.SchemaObject) => {
-  if (schema.anyOf!.length !== 2) return false;
-  const idx = schema.anyOf!.findIndex((item) => isNullableOutput(item));
-  if (idx === -1) return false;
-  const anyOf = schema.anyOf!;
-  delete schema.anyOf;
-  schema.nullable = true;
-  Object.assign(schema, anyOf[1 - idx]);
-  return true;
-};
-
-const prettifyEnum = (schema: OpenAPIV3.SchemaObject) => {
+export const processEnum = (schema: OpenAPIV3.SchemaObject) => {
+  if (!schema.anyOf) return;
   const result: unknown[] = [];
   let type: OpenAPIV3.SchemaObject['type'];
   for (const item of schema.anyOf!) {
@@ -54,9 +24,3 @@ const prettifyEnum = (schema: OpenAPIV3.SchemaObject) => {
   schema.enum = result;
   delete schema.anyOf;
 };
-
-export const processEnum = (schema: OpenAPIV3.SchemaObject) => {
-  if (!schema.anyOf) return;
-  if (processNullableOutput(schema)) return;
-  prettifyEnum(schema);
-};

packages/kbn-router-to-openapispec/src/oas_converter/kbn_config_schema/post_process_mutations/mutations/object.test.ts

@@ -11,10 +11,13 @@ import { joi2JsonInternal } from '../../parse';
 import { processObject } from './object';
 
 test.each([
-  [schema.object({}), { type: 'object', properties: {}, additionalProperties: false }],
+  [
+    schema.object({}),
+    { type: 'object', properties: {}, additionalProperties: false, required: [] },
+  ],
   [
     schema.object({ never: schema.never() }),
-    { type: 'object', properties: {}, additionalProperties: false },
+    { type: 'object', properties: {}, additionalProperties: false, required: [] },
   ],
   [
     schema.object(

packages/kbn-router-to-openapispec/src/oas_converter/kbn_config_schema/post_process_mutations/mutations/object.ts

@@ -38,7 +38,7 @@ const populateRequiredFields = (schema: OpenAPIV3.SchemaObject): void => {
     }
   }
 
-  if (required.length > 0) schema.required = required;
+  schema.required = required;
 };
 
 const removeNeverType = (schema: OpenAPIV3.SchemaObject): void => {

packages/kbn-router-to-openapispec/src/operation_id_counter.ts

@@ -11,7 +11,6 @@ export type OperationIdCounter = (name: string) => string;
 export const createOperationIdCounter = () => {
   const operationIdCounters = new Map<string, number>();
   return (name: string): string => {
-    name = encodeURIComponent(name);
     // Aliases an operationId to ensure it is unique across
     // multiple method+path combinations sharing a name.
     // "search" -> "search#0", "search#1", etc.