Refactor Project Services and Routes

backend/lib/routes/index.js

@@ -17,7 +17,7 @@ module.exports = {
   '/cloudprofiles': require('./cloudprofiles'),
   '/seeds': require('./seeds'),
   '/gardenerextensions': require('./gardenerExtensions'),
-  '/namespaces': require('./namespaces'),
+  '/namespaces': require('./namespaces'), // TODO delete this legacy route
   '/namespaces/:namespace/shoots': require('./shoots'),
   '/namespaces/:namespace/tickets': require('./tickets'),
   '/namespaces/:namespace/cloudprovidersecrets': require('./cloudProviderSecrets'),

backend/lib/routes/namespaces.js

@@ -7,7 +7,7 @@
 'use strict'
 
 const express = require('express')
-const { projects } = require('../services')
+const { namespaces } = require('../services')
 const { metricsRoute } = require('../middleware')
 
 const router = module.exports = express.Router()
@@ -19,7 +19,7 @@ router.route('/')
   .get(async (req, res, next) => {
     try {
       const user = req.user
-      res.send(await projects.list({ user }))
+      res.send(await namespaces.list({ user }))
     } catch (err) {
       next(err)
     }
@@ -28,7 +28,7 @@ router.route('/')
     try {
       const user = req.user
       const body = req.body
-      res.send(await projects.create({ user, body }))
+      res.send(await namespaces.create({ user, body }))
     } catch (err) {
       next(err)
     }
@@ -40,7 +40,7 @@ router.route('/:namespace')
     try {
       const user = req.user
       const name = req.params.namespace
-      res.send(await projects.read({ user, name }))
+      res.send(await namespaces.read({ user, name }))
     } catch (err) {
       next(err)
     }
@@ -50,7 +50,7 @@ router.route('/:namespace')
       const user = req.user
       const name = req.params.namespace
       const body = req.body
-      res.send(await projects.patch({ user, name, body }))
+      res.send(await namespaces.patch({ user, name, body }))
     } catch (err) {
       next(err)
     }
@@ -60,7 +60,7 @@ router.route('/:namespace')
       const user = req.user
       const name = req.params.namespace
       const body = req.body
-      res.send(await projects.patch({ user, name, body }))
+      res.send(await namespaces.patch({ user, name, body }))
     } catch (err) {
       next(err)
     }
@@ -69,7 +69,7 @@ router.route('/:namespace')
     try {
       const user = req.user
       const name = req.params.namespace
-      res.send(await projects.remove({ user, name }))
+      res.send(await namespaces.remove({ user, name }))
     } catch (err) {
       next(err)
     }

backend/lib/services/index.js

@@ -7,6 +7,7 @@
 module.exports = {
   cloudprofiles: require('./cloudprofiles'),
   seeds: require('./seeds'),
+  namespaces: require('./namespaces'),
   projects: require('./projects'),
   shoots: require('./shoots'),
   cloudProviderSecrets: require('./cloudProviderSecrets'),

backend/test/acceptance/__snapshots__/api.projects.spec.js.snap → backend/test/acceptance/__snapshots__/api.namespaces.spec.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`api projects should create a project 1`] = `
+exports[`api namespaces should create a project 1`] = `
 [
   [
     {
@@ -45,7 +45,7 @@ exports[`api projects should create a project 1`] = `
 ]
 `;
 
-exports[`api projects should create a project 2`] = `
+exports[`api namespaces should create a project 2`] = `
 {
   "data": {
     "createdBy": "[email protected]",
@@ -66,7 +66,7 @@ exports[`api projects should create a project 2`] = `
 }
 `;
 
-exports[`api projects should delete a project 1`] = `
+exports[`api namespaces should delete a project 1`] = `
 [
   [
     {
@@ -119,7 +119,7 @@ exports[`api projects should delete a project 1`] = `
 ]
 `;
 
-exports[`api projects should delete a project 2`] = `
+exports[`api namespaces should delete a project 2`] = `
 {
   "data": {
     "createdBy": "[email protected]",
@@ -140,7 +140,7 @@ exports[`api projects should delete a project 2`] = `
 }
 `;
 
-exports[`api projects should patch a project 1`] = `
+exports[`api namespaces should patch a project 1`] = `
 [
   [
     {
@@ -160,7 +160,7 @@ exports[`api projects should patch a project 1`] = `
 ]
 `;
 
-exports[`api projects should patch a project 2`] = `
+exports[`api namespaces should patch a project 2`] = `
 {
   "data": {
     "createdBy": "[email protected]",
@@ -181,7 +181,7 @@ exports[`api projects should patch a project 2`] = `
 }
 `;
 
-exports[`api projects should reject request with authorization error 1`] = `
+exports[`api namespaces should reject request with authorization error 1`] = `
 [
   [
     {
@@ -195,7 +195,7 @@ exports[`api projects should reject request with authorization error 1`] = `
 ]
 `;
 
-exports[`api projects should reject request with authorization error 2`] = `
+exports[`api namespaces should reject request with authorization error 2`] = `
 {
   "code": 403,
   "details": Any<Object>,
@@ -205,7 +205,7 @@ exports[`api projects should reject request with authorization error 2`] = `
 }
 `;
 
-exports[`api projects should return all projects 1`] = `
+exports[`api namespaces should return all projects 1`] = `
 [
   [
     {
@@ -231,7 +231,7 @@ exports[`api projects should return all projects 1`] = `
 ]
 `;
 
-exports[`api projects should return all projects 2`] = `
+exports[`api namespaces should return all projects 2`] = `
 [
   {
     "data": {
@@ -341,7 +341,7 @@ exports[`api projects should return all projects 2`] = `
 ]
 `;
 
-exports[`api projects should return the foo project 1`] = `
+exports[`api namespaces should return the foo project 1`] = `
 [
   [
     {
@@ -355,7 +355,7 @@ exports[`api projects should return the foo project 1`] = `
 ]
 `;
 
-exports[`api projects should return the foo project 2`] = `
+exports[`api namespaces should return the foo project 2`] = `
 {
   "data": {
     "createdBy": "[email protected]",
@@ -376,7 +376,7 @@ exports[`api projects should return the foo project 2`] = `
 }
 `;
 
-exports[`api projects should return three projects 1`] = `
+exports[`api namespaces should return three projects 1`] = `
 [
   [
     {
@@ -402,7 +402,7 @@ exports[`api projects should return three projects 1`] = `
 ]
 `;
 
-exports[`api projects should return three projects 2`] = `
+exports[`api namespaces should return three projects 2`] = `
 [
   {
     "data": {
@@ -453,7 +453,7 @@ exports[`api projects should return three projects 2`] = `
 ]
 `;
 
-exports[`api projects should timeout when creating a project 1`] = `
+exports[`api namespaces should timeout when creating a project 1`] = `
 [
   [
     {
@@ -498,7 +498,7 @@ exports[`api projects should timeout when creating a project 1`] = `
 ]
 `;
 
-exports[`api projects should timeout when creating a project 2`] = `
+exports[`api namespaces should timeout when creating a project 2`] = `
 {
   "code": 504,
   "details": Any<Object>,
@@ -508,7 +508,7 @@ exports[`api projects should timeout when creating a project 2`] = `
 }
 `;
 
-exports[`api projects should update a project 1`] = `
+exports[`api namespaces should update a project 1`] = `
 [
   [
     {
@@ -539,7 +539,7 @@ exports[`api projects should update a project 1`] = `
 ]
 `;
 
-exports[`api projects should update a project 2`] = `
+exports[`api namespaces should update a project 2`] = `
 {
   "data": {
     "createdBy": "[email protected]",

backend/test/acceptance/api.projects.spec.js → backend/test/acceptance/api.namespaces.spec.js

@@ -39,7 +39,7 @@ describe('api', function () {
     mockRequest.mockReset()
   })
 
-  describe('projects', function () {
+  describe('namespaces', function () {
     const user = fixtures.auth.createUser({
       id: '[email protected]',
       groups: ['group1']
@@ -52,7 +52,7 @@ describe('api', function () {
     const purpose = 'purpose'
 
     beforeAll(() => {
-      require('../../lib/services/projects').projectInitializationTimeout = 10
+      require('../../lib/services/namespaces').projectInitializationTimeout = 10
     })
 
     it('should return three projects', async function () {

backend/test/services.projects.spec.js → backend/test/services.namespaces.spec.js

@@ -6,12 +6,12 @@
 
 'use strict'
 
-const projects = require('../lib/services/projects')
+const projects = require('../lib/services/namespaces')
 const cache = require('../lib/cache')
 const authorization = require('../lib/services/authorization')
 
 describe('services', function () {
-  describe('projects', function () {
+  describe('namespaces', function () {
     const projectList = [
       {
         spec: {