Skip to content
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
49 changes: 44 additions & 5 deletions package-lock.json

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

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.2",
"async-retry": "^1.3.3",
"axios": "1.13.6",
"clean-deep": "3.4.0",
"cors": "2.8.6",
"debug": "4.4.3",
Expand All @@ -29,12 +28,14 @@
"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",
Expand All @@ -53,8 +54,8 @@
"@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/async-retry": "^1.4.8",
"@types/debug": "^4.1.13",
"@types/expect": "24.3.2",
"@types/express": "^5.0.6",
Expand All @@ -63,6 +64,7 @@
"@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.1",
"@typescript-eslint/parser": "8.57.1",
Expand Down
4 changes: 2 additions & 2 deletions src/api/v1/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
4 changes: 2 additions & 2 deletions src/api/v1/apps/{teamId}.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/api/v1/apps/{teamId}/{appId}.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

/**
Expand Down
6 changes: 5 additions & 1 deletion src/k8s-operations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ export async function checkPodExists(namespace: string, podName: string): Promis
}
}

let cachedKubernetesVersion: string | undefined

export async function getKubernetesVersion() {
if (process.env.NODE_ENV === 'development') return 'x.x.x'
if (cachedKubernetesVersion) return cachedKubernetesVersion

const kc = new KubeConfig()
kc.loadFromDefault()
Expand All @@ -62,7 +65,8 @@ export async function getKubernetesVersion() {
try {
const response = await k8sApi.getCode()
console.log('Kubernetes Server Version:', response.gitVersion)
return response.gitVersion
cachedKubernetesVersion = response.gitVersion
return cachedKubernetesVersion
} catch (error) {
debug(`Failed to get Kubernetes version.`)
}
Expand Down
Loading
Loading