Pull request update/240912

e8c6607 OS-5122. Fixed katara swagger 0e3babe OS-5119. Swagger fixes 49bd878 OS-7836. Update express
hystax · Sep 12, 2024 · d6f3b1c · d6f3b1c
2 parents 078568d + e8c6607
commit d6f3b1c
Show file tree

Hide file tree

Showing 16 changed files with 580 additions and 211 deletions.
diff --git a/jira_ui/server/package-lock.json b/jira_ui/server/package-lock.json
diff --git a/jira_ui/server/package.json b/jira_ui/server/package.json
@@ -14,7 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "dotenv": "^16.3.1",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-rate-limit": "^6.10.0"
   },
   "devDependencies": {

diff --git a/jira_ui/ui/package-lock.json b/jira_ui/ui/package-lock.json
diff --git a/jira_ui/ui/package.json b/jira_ui/ui/package.json
@@ -16,7 +16,7 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "dotenv": "^16.3.1",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "http-proxy-middleware": "^2.0.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/katara/katara_service/handlers/v2/recipients.py b/katara/katara_service/handlers/v2/recipients.py
@@ -35,7 +35,7 @@ async def get(self, recipient_id):
         tags: [recipients]
         summary: Get recipient
         parameters:
-        -   name: id
+        -   name: recipient_id
             in: path
             description: Recipient ID
             required: true
@@ -165,7 +165,7 @@ async def get(self, **kwargs):
             Required permission: CLUSTER_SECRET
         parameters:
         -   name: scope_id
-            in: path
+            in: query
             description: Recipient scope id (organization id)
             required: true
             type: string

diff --git a/katara/katara_service/handlers/v2/reports.py b/katara/katara_service/handlers/v2/reports.py
@@ -85,7 +85,7 @@ async def get(self, report_id):
         tags: [reports]
         summary: Get report
         parameters:
-        -   name: id
+        -   name: report_id
             in: path
             description: Report ID
             required: true

diff --git a/katara/katara_service/handlers/v2/schedules.py b/katara/katara_service/handlers/v2/schedules.py
@@ -26,7 +26,7 @@ async def get(self, schedule_id):
         tags: [schedules]
         summary: Get schedule
         parameters:
-        -   name: id
+        -   name: schedule_id
             in: path
             description: Schedule ID
             required: true
@@ -79,7 +79,7 @@ async def patch(self, schedule_id, **kwargs):
             Modifies a schedule with specified id \n\n
             Required permission: CLUSTER_SECRET
         parameters:
-        -   name: id
+        -   name: schedule_id
             in: path
             description: Schedule ID
             required: true
@@ -93,10 +93,6 @@ async def patch(self, schedule_id, **kwargs):
                 properties:
                     crontab: {type: string,
                         description: "Schedule in crontab format"}
-                    last_run: {type: integer,
-                        description: "Schedule last_run"}
-                    next_run: {type: integer,
-                        description: "Schedule next_run"}
         responses:
             200: {description: Success (returns modified schedule data)}
             400:
@@ -133,7 +129,7 @@ async def delete(self, schedule_id, **kwargs):
             Deletes schedule with specified id \n\n
             Required permission: CLUSTER_SECRET
         parameters:
-        -   name: id
+        -   name: schedule_id
             in: path
             description: Schedule ID
             required: true
@@ -225,12 +221,12 @@ async def get(self, **kwargs):
             Required permission: CLUSTER_SECRET
         parameters:
         -   name: recipient_id
-            in: path
+            in: query
             description: Schedule recipient id
             required: true
             type: string
         -   name: report_id
-            in: path
+            in: query
             description: Schedule report id
             required: false
             type: string

diff --git a/katara/katara_service/handlers/v2/tasks.py b/katara/katara_service/handlers/v2/tasks.py
@@ -154,7 +154,7 @@ async def patch(self, task_id, **kwargs):
             Modifies a task with specified id \n\n
             Required permission: CLUSTER_SECRET
         parameters:
-        -   name: id
+        -   name: task_id
             in: path
             description: Task ID
             required: true
@@ -166,8 +166,6 @@ async def patch(self, task_id, **kwargs):
             schema:
                 type: object
                 properties:
-                    completed_at: {type: integer,
-                        description: "Task completed timestamp"}
                     state: {type: string,
                         description: "Task state"}
                     result: {type: string,

diff --git a/ngui/server/package.json b/ngui/server/package.json
@@ -31,7 +31,7 @@
     "@types/node": "^20.14.9",
     "body-parser": "^1.20.2",
     "cors": "^2.8.5",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "graphql": "^16.9.0",
     "graphql-scalars": "^1.23.0",
     "http-proxy-middleware": "^2.0.6",