Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.14] [HTTP/OAS] Support `deprecated` field (#181240) #181582

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/kbn-config-schema/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ export type Schema = typeof schema;
import {
META_FIELD_X_OAS_REF_ID,
META_FIELD_X_OAS_OPTIONAL,
META_FIELD_X_OAS_DEPRECATED,
META_FIELD_X_OAS_MAX_LENGTH,
META_FIELD_X_OAS_MIN_LENGTH,
META_FIELD_X_OAS_GET_ADDITIONAL_PROPERTIES,
Expand All @@ -254,6 +255,7 @@ import {
export const metaFields = Object.freeze({
META_FIELD_X_OAS_REF_ID,
META_FIELD_X_OAS_OPTIONAL,
META_FIELD_X_OAS_DEPRECATED,
META_FIELD_X_OAS_MAX_LENGTH,
META_FIELD_X_OAS_MIN_LENGTH,
META_FIELD_X_OAS_GET_ADDITIONAL_PROPERTIES,
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-config-schema/src/oas_meta_fields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ export const META_FIELD_X_OAS_MAX_LENGTH = 'x-oas-max-length' as const;
export const META_FIELD_X_OAS_GET_ADDITIONAL_PROPERTIES =
'x-oas-get-additional-properties' as const;
export const META_FIELD_X_OAS_REF_ID = 'x-oas-ref-id' as const;
export const META_FIELD_X_OAS_DEPRECATED = 'x-oas-deprecated' as const;
24 changes: 18 additions & 6 deletions packages/kbn-config-schema/src/types/type.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,29 @@
import { get } from 'lodash';
import { internals } from '../internals';
import { Type, TypeOptions } from './type';
import { META_FIELD_X_OAS_REF_ID } from '../oas_meta_fields';
import { META_FIELD_X_OAS_REF_ID, META_FIELD_X_OAS_DEPRECATED } from '../oas_meta_fields';

class MyType extends Type<any> {
constructor(opts: TypeOptions<any> = {}) {
super(internals.any(), opts);
}
}

test('meta', () => {
const type = new MyType({ meta: { description: 'my description', id: 'foo' } });
const meta = type.getSchema().describe();
expect(get(meta, 'flags.description')).toBe('my description');
expect(get(meta, `metas[0].${META_FIELD_X_OAS_REF_ID}`)).toBe('foo');
describe('meta', () => {
it('sets meta when provided', () => {
const type = new MyType({
meta: { description: 'my description', id: 'foo', deprecated: true },
});
const meta = type.getSchema().describe();
expect(get(meta, 'flags.description')).toBe('my description');
expect(get(meta, `metas[0].${META_FIELD_X_OAS_REF_ID}`)).toBe('foo');
expect(get(meta, `metas[1].${META_FIELD_X_OAS_DEPRECATED}`)).toBe(true);
});

it('does not set meta when no provided', () => {
const type = new MyType();
const meta = type.getSchema().describe();
expect(get(meta, 'flags.description')).toBeUndefined();
expect(get(meta, 'metas')).toBeUndefined();
});
});
14 changes: 12 additions & 2 deletions packages/kbn-config-schema/src/types/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,23 @@
*/

import type { AnySchema, CustomValidator, ErrorReport } from 'joi';
import { META_FIELD_X_OAS_REF_ID } from '../oas_meta_fields';
import { META_FIELD_X_OAS_DEPRECATED, META_FIELD_X_OAS_REF_ID } from '../oas_meta_fields';
import { SchemaTypeError, ValidationError } from '../errors';
import { Reference } from '../references';

/** Meta fields used when introspecting runtime validation */
/**
* Meta fields used when introspecting runtime validation. Most notably for
* generating OpenAPI spec.
*/
export interface TypeMeta {
/**
* A human-friendly description of this type to be used in documentation.
*/
description?: string;
/**
* Whether this field is deprecated.
*/
deprecated?: boolean;
/**
* A string that uniquely identifies this schema. Used when generating OAS
* to create refs instead of inline schemas.
Expand Down Expand Up @@ -108,6 +115,9 @@ export abstract class Type<V> {
if (options.meta.id) {
schema = schema.meta({ [META_FIELD_X_OAS_REF_ID]: options.meta.id });
}
if (options.meta.deprecated) {
schema = schema.meta({ [META_FIELD_X_OAS_DEPRECATED]: true });
}
}

// Attach generic error handler only if it hasn't been attached yet since
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,12 @@ const getVersionedRouterDefaults = () => ({
fn: jest.fn(),
options: {
validate: {
request: { body: schema.object({ foo: schema.string() }) },
request: {
body: schema.object({
foo: schema.string(),
deprecatedFoo: schema.maybe(schema.string({ meta: { deprecated: true } })),
}),
},
response: {
[200]: { body: schema.object({ fooResponse: schema.string() }) },
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Joi from 'joi';
import { metaFields } from '@kbn/config-schema';
import type { OpenAPIV3 } from 'openapi-types';
import { parse } from '../../parse';
import { deleteField, stripBadDefault } from './utils';
import { deleteField, stripBadDefault, processDeprecated } from './utils';
import { IContext } from '../context';

const {
Expand Down Expand Up @@ -62,6 +62,7 @@ export const processMap = (ctx: IContext, schema: OpenAPIV3.SchemaObject): void
};

export const processAny = (schema: OpenAPIV3.SchemaObject): void => {
processDeprecated(schema);
stripBadDefault(schema);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import type { OpenAPIV3 } from 'openapi-types';
import { metaFields } from '@kbn/config-schema';

export const stripBadDefault = (schema: OpenAPIV3.SchemaObject): void => {
if (schema.default?.special === 'deep') {
Expand All @@ -26,6 +27,13 @@ export const stripBadDefault = (schema: OpenAPIV3.SchemaObject): void => {
}
};

export const processDeprecated = (schema: OpenAPIV3.SchemaObject): void => {
if (metaFields.META_FIELD_X_OAS_DEPRECATED in schema) {
schema.deprecated = true;
deleteField(schema, metaFields.META_FIELD_X_OAS_DEPRECATED);
}
};

/** Just for type convenience */
export const deleteField = (schema: Record<any, unknown>, field: string): void => {
delete schema[field];
Expand Down
Loading