Merge branch 'main' into post_release_v4.17

Author: Ani1357

Dockerfile

@@ -27,7 +27,7 @@ ENV NODE_ENV=production
 ENV NODE_PATH='dist'
 
 # Install dependencies
-RUN apk --no-cache add python3 git jq openssh
+RUN apk --no-cache add python3 git jq openssh tini
 
 # Install app
 RUN mkdir /app
@@ -42,4 +42,7 @@ RUN echo 'nouser:x:999:999::/home/nouser:/bin/sh' >> /etc/passwd
 USER node
 EXPOSE 8080
 
+# tini is used as PID 1 to reap zombie child processes (e.g. git-remote-http)
+# that Node.js would otherwise leave unreaped, causing PID exhaustion over time
+ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["node", "--max-http-header-size", "16384", "dist/src/app.js"]

package-lock.json

@@ -15,9 +15,8 @@
     "@linode/api-v4": "0.158.0",
     "@types/json-schema": "7.0.15",
     "@types/jsonwebtoken": "9.0.10",
-    "axios": "1.13.6",
-    "jose": "^6.2.1",
     "async-retry": "^1.3.3",
+    "axios": "1.13.6",
     "clean-deep": "3.4.0",
     "cors": "2.8.6",
     "debug": "4.4.3",
@@ -29,43 +28,46 @@
     "fs-extra": "11.3.4",
     "generate-password": "1.7.1",
     "glob": "13.0.6",
+    "jose": "^6.2.2",
     "jsonpath": "1.3.0",
     "jsonwebtoken": "9.0.3",
     "jwt-decode": "4.0.0",
     "lightship": "6.7.2",
     "lodash": "4.17.23",
     "morgan": "1.10.1",
+    "semver": "^7.7.4",
     "simple-git": "3.33.0",
     "socket.io": "4.8.3",
     "swagger-ui-express": "5.0.1",
     "ts-custom-error": "3.3.1",
     "uuid": "13.0.0",
-    "yaml": "2.8.2",
+    "yaml": "2.8.3",
     "zod": "^4.3.6"
   },
   "description": "The brain of the Otomi Container Platform. Handling console input and talking to core, it knows what to do.",
   "devDependencies": {
     "@babel/core": "7.29.0",
-    "@babel/preset-env": "7.29.0",
+    "@babel/preset-env": "7.29.2",
     "@babel/preset-typescript": "7.28.5",
     "@commitlint/cli": "20.5.0",
     "@commitlint/config-conventional": "20.5.0",
     "@eslint/compat": "2.0.3",
     "@redocly/openapi-cli": "1.0.0-beta.95",
     "@semantic-release/changelog": "6.0.3",
-    "@types/async-retry": "^1.4.8",
     "@semantic-release/git": "10.0.1",
-    "@types/debug": "^4.1.12",
+    "@types/async-retry": "^1.4.8",
+    "@types/debug": "^4.1.13",
     "@types/expect": "24.3.2",
     "@types/express": "^5.0.6",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "30.0.0",
     "@types/jsonpath": "0.2.4",
     "@types/lodash": "4.17.24",
     "@types/node": "24.12.0",
+    "@types/semver": "^7.7.1",
     "@types/supertest": "7.2.0",
-    "@typescript-eslint/eslint-plugin": "8.57.0",
-    "@typescript-eslint/parser": "8.57.0",
+    "@typescript-eslint/eslint-plugin": "8.57.1",
+    "@typescript-eslint/parser": "8.57.1",
     "babel-jest": "30.3.0",
     "commitizen": "4.3.1",
     "copyfiles": "2.4.1",

package.json

@@ -27,7 +27,7 @@ function createTeamResource(kind: AplKind, spec: Record<string, any>) {
   }
 }
 
-jest.mock('./k8s_operations')
+jest.mock('./k8s-operations')
 jest.mock('./utils/sealedSecretUtils')
 beforeAll(async () => {
   jest.spyOn(console, 'log').mockImplementation(() => {})

src/api-v2.authz.test.ts

@@ -20,7 +20,7 @@ const userToken = getToken([])
 const teamId = 'team1'
 const otherTeamId = 'team2'
 
-jest.mock('./k8s_operations')
+jest.mock('./k8s-operations')
 jest.mock('./utils/sealedSecretUtils')
 beforeAll(async () => {
   jest.spyOn(console, 'log').mockImplementation(() => {})

src/api.authz.test.ts

@@ -9,7 +9,7 @@ const debug = Debug('otomi:api:v1:apps')
  * Get all apps across all teams
  * Returns list of all apps with their ids and enabled status
  */
-export const getApps = (req: OpenApiRequestExt, res: Response): void => {
+export const getApps = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   debug('getAllApps')
-  res.json(req.otomi.getApps())
+  res.json(await req.otomi.getApps())
 }

src/api/v1/apps.ts

@@ -9,10 +9,10 @@ const debug = Debug('otomi:api:v1:apps')
  * Get apps for a team
  * Returns list of team apps with their ids and enabled status
  */
-export const getTeamApps = (req: OpenApiRequestExt, res: Response): void => {
+export const getTeamApps = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   const { teamId } = req.params
   debug('getTeamApps', teamId)
-  res.json(req.otomi.getTeamApps(teamId))
+  res.json(await req.otomi.getTeamApps(teamId))
 }
 
 /**

src/api/v1/apps/{teamId}.ts

@@ -5,9 +5,9 @@ import { App, OpenApiRequestExt } from 'src/otomi-models'
  * GET /v1/apps/{teamId}/{appId}
  * Get a specific team app
  */
-export const getTeamApp = (req: OpenApiRequestExt, res: Response): void => {
+export const getTeamApp = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   const { teamId, appId } = req.params
-  res.json(req.otomi.getTeamApp(teamId, appId))
+  res.json(await req.otomi.getTeamApp(teamId, appId))
 }
 
 /**

src/api/v1/apps/{teamId}/{appId}.ts

@@ -23,6 +23,7 @@ export const connectCloudtty = async (req: OpenApiRequestExt, res: Response): Pr
 export const deleteCloudtty = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   const sessionUser = req.user
   debug(`deleteCloudtty - ${sessionUser.email} - ${sessionUser.sub}`)
-  await req.otomi.deleteCloudtty(sessionUser)
+  const { teamId } = req.query as { teamId: string }
+  await req.otomi.deleteCloudtty(teamId, sessionUser)
   res.json({})
 }

src/api/v1/cloudtty.ts

@@ -1,6 +1,6 @@
 import Debug from 'debug'
 import { Request, Response } from 'express'
-import { getSealedSecretsKeys } from 'src/k8s_operations'
+import { getSealedSecretsKeys } from 'src/k8s-operations'
 import YAML from 'yaml'
 
 const debug = Debug('otomi:api:v1:sealedsecrets')