Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 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
1 change: 0 additions & 1 deletion package-lock.json

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

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"@types/jsonwebtoken": "^9.0.1",
"aws-sdk": "^2.879.0",
"axios": "^0.27.0",
"body-parser": "^1.19.0",
"change-case": "^4.1.2",
"clean-deep": "^3.4.0",
"cors": "^2.8.5",
Expand Down
6 changes: 3 additions & 3 deletions src/api/teams/{teamId}/workloads/{workloadId}/values.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ const debug = Debug('otomi:api:teams:workloadValues')
export default function (): OperationHandlerArray {
const get: Operation = [
({ otomi, params: { workloadId } }: OpenApiRequestExt, res): void => {
debug(`editWorkloadValues(${workloadId})`)
debug(`getWorkloadValues(${workloadId})`)
const data = otomi.getWorkloadValues(decodeURIComponent(workloadId))
res.json(data)
},
]

const put: Operation = [
({ otomi, params: { teamId, workloadId }, body }: OpenApiRequestExt, res): void => {
debug(`editWorkloadValues(${workloadId})`)
debug(`putWorkloadValues(${workloadId})`)
const data = otomi.editWorkloadValues(decodeURIComponent(workloadId), {
...body,
teamId: decodeURIComponent(teamId),
Expand All @@ -27,7 +27,7 @@ export default function (): OperationHandlerArray {
const patch: Operation = [
({ otomi, params: { teamId, workloadId }, body }: OpenApiRequestExt, res): void => {
const { image, containerPorts, fullnameOverride, ...rest } = body.values
debug(`editWorkloadValues(${workloadId})`)
debug(`patchWorkloadValues(${workloadId})`)
const data = otomi.editWorkloadValues(decodeURIComponent(workloadId), {
id: workloadId,
values: {
Expand Down
5 changes: 1 addition & 4 deletions src/app.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
/* eslint-disable @typescript-eslint/no-use-before-define */
import $parser from '@apidevtools/json-schema-ref-parser'
import { json } from 'body-parser'
import cors from 'cors'
import Debug from 'debug'
import express, { request } from 'express'
Expand Down Expand Up @@ -136,10 +135,9 @@ export async function initApp(inOtomiStack?: OtomiStack | undefined) {
const apiRoutesPath = path.resolve(__dirname, 'api')
await loadSpec()
const authz = new Authz(otomiSpec.spec)

app.use(logger('dev'))
app.use(cors())
app.use(json())
app.use(express.json({ limit: '500kb' }))
app.use(jwtMiddleware())
if (env.isDev) {
app.all('/mock/:idx', (req, res, next) => {
Expand Down Expand Up @@ -203,7 +201,6 @@ export async function initApp(inOtomiStack?: OtomiStack | undefined) {

// and register session middleware
app.use(sessionMiddleware(server as Server))

// now we can initialize the more specific routes
initialize({
// @ts-ignore
Expand Down