Esm packages

.dockerignore

@@ -17,31 +17,31 @@
 
 # include workspace packages/logger
 !packages/logger/package.json
-!packages/logger/lib
+!packages/logger/dist
 
 # include workspace packages/request
 !packages/request/package.json
-!packages/request/lib
+!packages/request/dist
 
 # include workspace packages/polling-watcher
 !packages/polling-watcher/package.json
-!packages/polling-watcher/lib
+!packages/polling-watcher/dist
 
 # include workspace packages/kube-config
 !packages/kube-config/package.json
-!packages/kube-config/lib
+!packages/kube-config/dist
 
 # include workspace packages/kube-client
 !packages/kube-client/package.json
-!packages/kube-client/lib
+!packages/kube-client/dist
 
 # include workspace packages/monitor
 !packages/monitor/package.json
-!packages/monitor/lib
+!packages/monitor/dist
 
 # include workspace backend
 !backend/package.json
-!backend/server.mjs
+!backend/server.js
 !backend/lib
 
 # include workspace frontend
@@ -61,9 +61,12 @@
 !charts/gardener-dashboard
 !charts/identity
 
+# include workspace packages
+!packages/package.json
+
 # include workspace packages/test-utils
 !packages/test-utils/package.json
-!packages/test-utils/lib
+!packages/test-utils/dist
 
 # include metadata files
 !VERSION

.vscode/settings.json

@@ -38,7 +38,7 @@
     "**/.yarn/versions/**": true,
     "**/dist": true
   },
-  "eslint.nodePath": ".yarn/sdks",
+  "eslint.runtime": "./scripts/eslint-yarn-node.js",
   "files.exclude": {
     "logo": true,
     "LICENSES": true,

Dockerfile

@@ -73,4 +73,4 @@ FROM node-scratch AS dashboard
 COPY --from=dashboard-builder /app/dist .
 
 ENTRYPOINT [ "tini", "--", "node", "--require=/app/.pnp.cjs", "--loader=/app/.pnp.loader.mjs"]
-CMD ["server.mjs"]
+CMD ["server.js"]

REUSE.toml

@@ -36,7 +36,8 @@ path = [
   "yarn.lock",
   "REUSE.toml",
   ".dependency-cruiser.mjs",
-  "diagram/**"
+  "diagram/**",
+  "scripts/eslint-yarn-node.js"
 ]
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2017-2024 SAP SE or an SAP affiliate company and Gardener contributors"

backend/README.md

@@ -24,3 +24,4 @@ yarn test
 yarn test:coverage
 
 ```
+

backend/__tests__/acceptance/api.cloudProviderCredentials.spec.js

@@ -18,8 +18,8 @@ function createStore (items) {
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
 
     cache.initialize({
       shoots: {

backend/__tests__/acceptance/api.cloudprofiles.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.controllerregistrations.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.info.spec.js

@@ -12,8 +12,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.members.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.resourceQuotas.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.seeds.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.shoots.spec.js

@@ -22,8 +22,8 @@ function createStore (items) {
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
 
     cache.initialize({
       projects: {

backend/__tests__/acceptance/api.terminals.spec.js

@@ -21,8 +21,8 @@ function getTerminalName (target, identifier) {
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.tickets.spec.js

@@ -13,8 +13,8 @@ const tickets = require('../../lib/services/tickets')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/api.user.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('api', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/auth.spec.js

@@ -72,8 +72,8 @@ describe('auth', function () {
 
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/config.spec.js

@@ -11,8 +11,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('config', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/healthz.spec.js

@@ -12,8 +12,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('healthz', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/io.spec.js

@@ -81,7 +81,7 @@ describe('api', function () {
   let socket
   let nsp
 
-  beforeAll(async () => {
+  beforeAll(() => {
     cache.cache.resetTicketCache()
     cache.initialize({
       projects: {
@@ -91,7 +91,7 @@ describe('api', function () {
         store: createStore(fixtures.shoots.list()),
       },
     })
-    agent = await createAgent('io', cache)
+    agent = createAgent('io', cache)
     nsp = agent.io.sockets
   })
 

backend/__tests__/acceptance/openapi.spec.js

@@ -13,8 +13,8 @@ const { mockRequest } = require('@gardener-dashboard/request')
 describe('openapi', function () {
   let agent
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/acceptance/webhook.spec.js

@@ -18,8 +18,8 @@ describe('github', function () {
   const now = new Date('2006-01-02T15:04:05.000Z')
   const microDateStr = now.toISOString().replace(/Z$/, '000Z')
 
-  beforeAll(async () => {
-    agent = await createAgent()
+  beforeAll(() => {
+    agent = createAgent()
   })
 
   afterAll(() => {

backend/__tests__/healthz.spec.js

@@ -8,15 +8,11 @@
 
 const { createHttpError } = require('@gardener-dashboard/request')
 const { dashboardClient } = require('@gardener-dashboard/kube-client')
+const { healthCheck } = require('../lib/healthz')
 
 describe('healthz', function () {
   const healthz = dashboardClient.healthz
 
-  let healthCheck
-  beforeAll(async () => {
-    ({ healthCheck } = await import('../lib/healthz/index.mjs'))
-  })
-
   beforeEach(function () {
     healthz.get = jest.fn()
   })

backend/__tests__/server.spec.js

@@ -9,7 +9,7 @@
 const http = require('http')
 const terminus = require('@godaddy/terminus')
 const metricsApp = require('@gardener-dashboard/monitor')
-let createServer
+const createServer = require('../lib/server')
 
 function createApplication (port, metricsPort) {
   const app = (req, res) => {
@@ -45,9 +45,6 @@ function createApplication (port, metricsPort) {
 }
 
 describe('server', () => {
-  beforeAll(async () => {
-    ({ createServer } = await import('../lib/server.mjs'))
-  })
   const port = 1234
   const metricsPort = 5678
   const mockServer = {

backend/jest.setup.js

@@ -16,8 +16,8 @@ const { matchers, ...fixtures } = require('./__fixtures__')
 
 expect.extend(matchers)
 
-async function createHttpAgent () {
-  const { app } = await import('./lib/app.mjs')
+function createHttpAgent () {
+  const app = require('./lib/app')
   let server = http.createServer(app)
   const healthCheck = app.get('healthCheck')
   if (typeof healthCheck === 'function') {
@@ -90,7 +90,7 @@ function createSocketAgent (cache) {
   return agent
 }
 
-async function createAgent (type = 'http', cache) {
+function createAgent (type = 'http', cache) {
   switch (type) {
     case 'io':
       return createSocketAgent(cache)

backend/lib/api.js

@@ -0,0 +1,45 @@
+//
+// SPDX-FileCopyrightText: 2023 SAP SE or an SAP affiliate company and Gardener contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+'use strict'
+
+const express = require('express')
+const bodyParser = require('body-parser')
+const cookieParser = require('cookie-parser')
+const zlib = require('zlib')
+const compression = require('compression')
+const config = require('./config')
+const routes = require('./routes')
+const hooks = require('./hooks')()
+const { authenticate } = require('./security')
+const { createClient } = require('@gardener-dashboard/kube-client')
+const { notFound, sendError, requestLogger } = require('./middleware')
+const { monitorResponseTimes } = require('@gardener-dashboard/monitor')
+// configure router
+const router = express.Router()
+
+router.use(compression({
+  threshold: 8192,
+  level: zlib.constants.Z_DEFAULT_COMPRESSION,
+}))
+router.use(requestLogger)
+router.use(monitorResponseTimes())
+router.use(cookieParser())
+router.use(bodyParser.json({
+  limit: config.maxRequestBodySize,
+}))
+router.use(authenticate({ createClient }))
+for (const [key, value] of Object.entries(routes)) {
+  router.use(key, value)
+}
+router.use(notFound)
+router.use(sendError)
+
+// exports
+module.exports = {
+  router,
+  hooks,
+}