From ea62dd32a1f002dd3703f52329e83201919debbb Mon Sep 17 00:00:00 2001 From: Aindriu Lavelle Date: Thu, 27 Jul 2023 07:34:26 +0100 Subject: [PATCH] Update to resolve missing endpoint added in previous PR Signed-off-by: Aindriu Lavelle --- coral/src/services/api.ts | 1 + coral/types/api.d.ts | 106 ++++++++++++++++++++++++-------------- openapi.yaml | 3 +- 3 files changed, 69 insertions(+), 41 deletions(-) diff --git a/coral/src/services/api.ts b/coral/src/services/api.ts index 5107c44133..26c1632073 100644 --- a/coral/src/services/api.ts +++ b/coral/src/services/api.ts @@ -188,6 +188,7 @@ const API_PATHS = { getAclRequests: "/getAclRequests", getAclRequestsForApprover: "/getAclRequestsForApprover", getAclCommand: "/getAclCommands", + getTopicRequest: "/getTopicRequests", } satisfies { [key in keyof Omit< ApiOperations, diff --git a/coral/types/api.d.ts b/coral/types/api.d.ts index 9ee43ef193..c3235090b0 100644 --- a/coral/types/api.d.ts +++ b/coral/types/api.d.ts @@ -225,6 +225,9 @@ export type paths = { "/user/{userId}/switchTeamsList": { get: operations["getSwitchTeams"]; }; + "/topic/request/{topicReqId}": { + get: operations["getTopicRequest"]; + }; "/testClusterApiConnection": { get: operations["testClusterApiConnection"]; }; @@ -497,6 +500,8 @@ export type components = { appname?: string; remarks?: string; requestor?: string; + /** Format: int32 */ + requestId?: number; topicname: string; schemafull: string; schemaversion?: string; @@ -538,6 +543,8 @@ export type components = { appname?: string; remarks?: string; requestor?: string; + /** Format: int32 */ + requestId?: number; topicname: string; /** Format: int32 */ topicpartitions: number; @@ -738,6 +745,8 @@ export type components = { appname?: string; remarks?: string; requestor?: string; + /** Format: int32 */ + requestId?: number; topicname: string; /** Format: int32 */ topicpartitions: number; @@ -765,6 +774,8 @@ export type components = { appname?: string; remarks?: string; requestor?: string; + /** Format: int32 */ + requestId?: number; connectorName: string; connectorConfig: string; description: string; @@ -787,6 +798,8 @@ export type components = { appname?: string; remarks?: string; requestor?: string; + /** Format: int32 */ + requestId?: number; topicname: string; consumergroup?: string; acl_ip?: (string)[]; @@ -886,6 +899,45 @@ export type components = { teammail?: string; envList?: (string)[]; }; + TopicRequestsResponseModel: { + environment: string; + environmentName: string; + requestor: string; + /** Format: int32 */ + teamId: number; + teamname: string; + /** @enum {string} */ + requestOperationType: "CREATE" | "UPDATE" | "PROMOTE" | "CLAIM" | "DELETE"; + /** @enum {string} */ + requestStatus: "CREATED" | "DELETED" | "DECLINED" | "APPROVED" | "ALL"; + /** Format: date-time */ + requesttime: string; + requesttimestring: string; + currentPage: string; + totalNoPages: string; + allPageNos: (string)[]; + approvingTeamDetails: string; + approver?: string; + /** Format: date-time */ + approvingtime?: string; + remarks?: string; + appname?: string; + otherParams?: string; + topicname: string; + /** Format: int32 */ + topicpartitions: number; + replicationfactor: string; + description: string; + /** Format: int32 */ + topicid: number; + deleteAssociatedSchema: boolean; + advancedTopicConfigEntries: (components["schemas"]["TopicConfigEntry"])[]; + approvingTeamId?: string; + sequence?: string; + possibleTeams?: (string)[]; + deletable?: boolean; + editable?: boolean; + }; ConnectivityStatus: { clusterType?: string; connectionStatus?: string; @@ -986,45 +1038,6 @@ export type components = { error?: string; status: boolean; }; - TopicRequestsResponseModel: { - environment: string; - environmentName: string; - requestor: string; - /** Format: int32 */ - teamId: number; - teamname: string; - /** @enum {string} */ - requestOperationType: "CREATE" | "UPDATE" | "PROMOTE" | "CLAIM" | "DELETE"; - /** @enum {string} */ - requestStatus: "CREATED" | "DELETED" | "DECLINED" | "APPROVED" | "ALL"; - /** Format: date-time */ - requesttime: string; - requesttimestring: string; - currentPage: string; - totalNoPages: string; - allPageNos: (string)[]; - approvingTeamDetails: string; - approver?: string; - /** Format: date-time */ - approvingtime?: string; - remarks?: string; - appname?: string; - otherParams?: string; - topicname: string; - /** Format: int32 */ - topicpartitions: number; - replicationfactor: string; - description: string; - /** Format: int32 */ - topicid: number; - deleteAssociatedSchema: boolean; - advancedTopicConfigEntries: (components["schemas"]["TopicConfigEntry"])[]; - approvingTeamId?: string; - sequence?: string; - possibleTeams?: (string)[]; - deletable?: boolean; - editable?: boolean; - }; AclOverviewInfo: { req_no: string; aclPatternType: string; @@ -2748,6 +2761,21 @@ export type operations = { }; }; }; + getTopicRequest: { + parameters: { + path: { + topicReqId: number; + }; + }; + responses: { + /** @description OK */ + 200: { + content: { + "application/json": components["schemas"]["TopicRequestsResponseModel"]; + }; + }; + }; + }; testClusterApiConnection: { parameters: { query: { diff --git a/openapi.yaml b/openapi.yaml index 8e730c5d25..e45db45f09 100644 --- a/openapi.yaml +++ b/openapi.yaml @@ -10,7 +10,7 @@ "name" : "Apache 2.0", "url" : "https://www.apache.org/licenses/LICENSE-2.0.html" }, - "version" : "2.5.0" + "version" : "2.4.0" }, "externalDocs" : { "description" : "Klaw documentation", @@ -50,7 +50,6 @@ } }, "/user/updateTeam" : { - "post" : { "tags" : [ "users-teams-controller" ], "operationId" : "updateUserTeamFromSwitchTeams",