From 7f417559bb2728adcbb34eec6355468f2c8b91bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Frinnstr=C3=B6m?=
 <mattias.frinnstrom@husqvarnagroup.com>
Date: Mon, 26 Oct 2020 16:04:45 +0100
Subject: [PATCH] Move working directory config to backend

---
 app-config.yaml                                               | 2 +-
 packages/create-app/templates/default-app/app-config.yaml.hbs | 2 +-
 plugins/scaffolder-backend/src/service/router.test.ts         | 2 +-
 plugins/scaffolder-backend/src/service/router.ts              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-config.yaml b/app-config.yaml
index 009876a64b..4746e822da 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -16,6 +16,7 @@ backend:
     credentials: true
   csp:
     connect-src: ["'self'", 'http:', 'https:']
+  # workingDirectory: /tmp # Use this to configure a working direcotry for the scaffolder, defaults to the OS temp-dir
 
 # See README.md in the proxy-backend plugin for information on the configuration format
 proxy:
@@ -155,7 +156,6 @@ catalog:
       target: https://github.com/spotify/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
 
 scaffolder:
-  # workingDirectory: /tmp # Use this to configure a working direcotry for the scaffolder, defaults to the OS temp-dir
   github:
     token:
       $env: GITHUB_TOKEN
diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs
index 9f66e7db0a..d643c72e0c 100644
--- a/packages/create-app/templates/default-app/app-config.yaml.hbs
+++ b/packages/create-app/templates/default-app/app-config.yaml.hbs
@@ -38,6 +38,7 @@ backend:
         #ca: # if you have a CA file and want to verify it you can uncomment this section
         #  $file: <file-path>/ca/server.crt
   {{/if}}
+  # workingDirectory: /tmp # Use this to configure a working direcotry for the scaffolder, defaults to the OS temp-dir
 
 integrations:
   github:
@@ -69,7 +70,6 @@ auth:
   providers: {}
 
 scaffolder:
-  # workingDirectory: /tmp # Use this to configure a working direcotry for the scaffolder, defaults to the OS temp-dir
   github:
     token:
       $env: GITHUB_TOKEN
diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts
index 32f9604caf..bca17aa029 100644
--- a/plugins/scaffolder-backend/src/service/router.test.ts
+++ b/plugins/scaffolder-backend/src/service/router.test.ts
@@ -54,7 +54,7 @@ describe('createRouter - working directory', () => {
   const workDirConfig = (path: string) => ({
     context: '',
     data: {
-      scaffolder: {
+      backend: {
         workingDirectory: path,
       },
     },
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index 60c17a3e80..e66728ac91 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -61,7 +61,7 @@ export async function createRouter(
   const jobProcessor = new JobProcessor();
 
   const workingDirectory =
-    config.getOptionalString('scaffolder.workingDirectory') ?? os.tmpdir();
+    config.getOptionalString('backend.workingDirectory') ?? os.tmpdir();
   try {
     // Check if working directory exists and is writable
     await fs.promises.access(