Refactor create shoot

.secrets.baseline

@@ -1,9 +1,9 @@
 {
   "exclude": {
-    "files": "^.secrets.baseline$",
+    "files": "^.secrets.baseline$|^.secrets.baseline_temp$",
     "lines": null
   },
-  "generated_at": "2019-07-02T10:37:07Z",
+  "generated_at": "2019-08-23T13:59:56Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -34,7 +34,7 @@
       {
         "hashed_secret": "0b4049b5e5a601cb07835c4b4b6881a9a609387c",
         "is_secret": false,
-        "line_number": 49,
+        "line_number": 48,
         "type": "Secret Keyword"
       }
     ],
@@ -60,7 +60,15 @@
       {
         "hashed_secret": "959d73abdef41e5d0f4ec2afd98cb68d37953a2a",
         "is_secret": false,
-        "line_number": 22,
+        "line_number": 21,
+        "type": "Secret Keyword"
+      }
+    ],
+    "backend/lib/github/octokit.js": [
+      {
+        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
+        "is_secret": false,
+        "line_number": 56,
         "type": "Secret Keyword"
       }
     ],
@@ -76,13 +84,13 @@
       {
         "hashed_secret": "7ea6be9eecb6605329a1b1870c2fd2af9b896991",
         "is_secret": false,
-        "line_number": 42,
+        "line_number": 43,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "8b142a91cfb6e617618ad437cedf74a6745f8926",
         "is_secret": false,
-        "line_number": 79,
+        "line_number": 93,
         "type": "Secret Keyword"
       }
     ],
@@ -112,35 +120,35 @@
       {
         "hashed_secret": "30118aa1aa8a06fa5365743b3a5db69fc62b9760",
         "is_secret": false,
-        "line_number": 270,
+        "line_number": 263,
         "type": "Secret Keyword"
       }
     ],
     "backend/test/acceptance/api.infrastructureSecrets.spec.js": [
       {
         "hashed_secret": "e9fe51f94eadabf54dbf2fbbd57188b9abee436e",
         "is_secret": false,
-        "line_number": 37,
+        "line_number": 35,
         "type": "Secret Keyword"
       }
     ],
     "backend/test/acceptance/api.shoots.spec.js": [
       {
         "hashed_secret": "f7e3bc894e61a47eb1810807767610a3c88527c3",
         "is_secret": false,
-        "line_number": 118,
+        "line_number": 116,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "ccbee52710eb8a59dad640c207009ad01fc76b35",
         "is_secret": false,
-        "line_number": 120,
+        "line_number": 118,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "0ac5df4b0f96ad426c76dd945dfcef01e25c8818",
         "is_secret": false,
-        "line_number": 122,
+        "line_number": 120,
         "type": "Secret Keyword"
       }
     ],
@@ -208,21 +216,21 @@
       {
         "hashed_secret": "fb3c6e4de85bd9eae26fdc63e75f10a7f39e850e",
         "is_secret": false,
-        "line_number": 52,
+        "line_number": 50,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "8843d7f92416211de9ebb963ff4ce28125932878",
         "is_secret": false,
-        "line_number": 79,
+        "line_number": 77,
         "type": "Secret Keyword"
       }
     ],
     "charts/identity/templates/configmap.yaml": [
       {
         "hashed_secret": "09343c85545555efc31e6e70b7ea7dcadf854930",
         "is_secret": false,
-        "line_number": 42,
+        "line_number": 43,
         "type": "Secret Keyword"
       }
     ],
@@ -246,6 +254,52 @@
         "type": "Private Key"
       }
     ],
+    "frontend/src/components/NewShoot/NewShootDetails.vue": [
+      {
+        "hashed_secret": "d5d4cd07616a542891b7ec2d0257b3a24b69856e",
+        "is_secret": false,
+        "line_number": 121,
+        "type": "Secret Keyword"
+      },
+      {
+        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
+        "is_secret": false,
+        "line_number": 191,
+        "type": "Secret Keyword"
+      }
+    ],
+    "frontend/src/components/NewShoot/NewShootInfrastructureDetails.vue": [
+      {
+        "hashed_secret": "2c0580ffd7d80319531cf629f5e90f747b1386f1",
+        "is_secret": false,
+        "line_number": 193,
+        "type": "Secret Keyword"
+      },
+      {
+        "hashed_secret": "b8c6d8c49add25b398e5beeaae12689ee2bd10b6",
+        "is_secret": false,
+        "line_number": 386,
+        "type": "Secret Keyword"
+      },
+      {
+        "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
+        "is_secret": false,
+        "line_number": 396,
+        "type": "Secret Keyword"
+      },
+      {
+        "hashed_secret": "22f6a1953ff02167cbfecf24ea856d94bc397254",
+        "is_secret": false,
+        "line_number": 412,
+        "type": "Secret Keyword"
+      },
+      {
+        "hashed_secret": "bd66a10f34934a079686639a5b287d8dad8d1c4c",
+        "is_secret": false,
+        "line_number": 414,
+        "type": "Secret Keyword"
+      }
+    ],
     "frontend/src/components/Secret.vue": [
       {
         "hashed_secret": "e8cdc05b346aa0d4a91a2bf6d7c6a0941a6555a7",
@@ -376,11 +430,27 @@
         "type": "Secret Keyword"
       }
     ],
+    "frontend/src/dialogs/SecretDialogWrapper.vue": [
+      {
+        "hashed_secret": "32f64badcf839f19bfd0b409f9c49ead291fba63",
+        "is_secret": false,
+        "line_number": 31,
+        "type": "Secret Keyword"
+      }
+    ],
+    "frontend/src/pages/NewShoot.vue": [
+      {
+        "hashed_secret": "cb780a6106d2b3106ec569f878d3068415696acd",
+        "is_secret": false,
+        "line_number": 285,
+        "type": "Secret Keyword"
+      }
+    ],
     "frontend/src/pages/Secrets.vue": [
       {
         "hashed_secret": "32f64badcf839f19bfd0b409f9c49ead291fba63",
         "is_secret": false,
-        "line_number": 148,
+        "line_number": 134,
         "type": "Secret Keyword"
       }
     ]

backend/lib/middleware.js

@@ -20,14 +20,9 @@ const _ = require('lodash')
 const config = require('./config')
 const logger = require('./logger')
 const { NotFound, InternalServerError } = require('./errors')
-const { customAddonDefinitions } = require('./services')
 
-async function frontendConfig (req, res, next) {
-  const user = req.user
+function frontendConfig (req, res, next) {
   const frontendConfig = {}
-  try {
-    frontendConfig.customAddonDefinitions = await customAddonDefinitions.list({ user, namespace: 'garden' })
-  } catch (err) { /* ignore error */ }
   res.json(Object.assign(frontendConfig, config.frontend))
 }
 

backend/lib/routes/shoots.js

@@ -129,6 +129,19 @@ router.route('/:name/spec/hibernation/schedules')
     }
   })
 
+router.route('/:name/spec/addons')
+  .put(async (req, res, next) => {
+    try {
+      const user = req.user
+      const namespace = req.params.namespace
+      const name = req.params.name
+      const body = req.body
+      res.send(await shoots.replaceAddons({ user, namespace, name, body }))
+    } catch (err) {
+      next(err)
+    }
+  })
+
 router.route('/:name/spec/cloud/:infrastructureKind/workers')
   .put(async (req, res, next) => {
     try {

backend/lib/services/index.js

@@ -23,6 +23,5 @@ module.exports = {
   members: require('./members'),
   authorization: require('./authorization'),
   authentication: require('./authentication'),
-  journals: require('./journals'),
-  customAddonDefinitions: require('./customAddonDefinitions')
+  journals: require('./journals')
 }

backend/lib/services/shoots.js

@@ -142,6 +142,16 @@ exports.replaceHibernationSchedules = async function ({ user, namespace, name, b
   return patch({ user, namespace, name, body: payload })
 }
 
+exports.replaceAddons = async function ({ user, namespace, name, body }) {
+  const addons = body
+  const payload = {
+    spec: {
+      addons
+    }
+  }
+  return patch({ user, namespace, name, body: payload })
+}
+
 exports.replaceWorkers = async function ({ user, namespace, infrastructureKind, name, body }) {
   const workers = body
   const patchOperations = [
@@ -155,7 +165,7 @@ exports.replaceWorkers = async function ({ user, namespace, infrastructureKind,
 }
 
 exports.replaceMaintenance = async function ({ user, namespace, name, body }) {
-  const { timeWindowBegin, timeWindowEnd, updateKubernetesVersion } = body
+  const { timeWindowBegin, timeWindowEnd, updateKubernetesVersion, updateOSVersion } = body
   const payload = {
     spec: {
       maintenance: {
@@ -164,7 +174,8 @@ exports.replaceMaintenance = async function ({ user, namespace, name, body }) {
           end: timeWindowEnd
         },
         autoUpdate: {
-          kubernetesVersion: updateKubernetesVersion
+          kubernetesVersion: updateKubernetesVersion,
+          machineImageVersion: updateOSVersion
         }
       }
     }