From 0e7f3c8929716c5a7caddcbaf6992f9b8306f032 Mon Sep 17 00:00:00 2001
From: Ben Jackson <b@benjackson.email>
Date: Fri, 5 Nov 2021 07:34:24 +1100
Subject: [PATCH] fix: always create a backupS3Config and use it

---
 node-packages/commons/src/tasks.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/node-packages/commons/src/tasks.ts b/node-packages/commons/src/tasks.ts
index 658743a69d..5eba460cbd 100644
--- a/node-packages/commons/src/tasks.ts
+++ b/node-packages/commons/src/tasks.ts
@@ -793,7 +793,7 @@ export const createRemoveTask = async function(removeData: any) {
 }
 
 // creates the restore job configuration for use in the misc task
-const restoreConfig = (name, backupId, safeProjectName, baasBucketName, backupS3Config, restoreS3Config) => {
+const restoreConfig = (name, backupId, backupS3Config, restoreS3Config) => {
   let config = {
     apiVersion: 'backup.appuio.ch/v1alpha1',
     kind: 'Restore',
@@ -806,9 +806,7 @@ const restoreConfig = (name, backupId, safeProjectName, baasBucketName, backupS3
         s3: restoreS3Config ? restoreS3Config : {},
       },
       backend: {
-        s3: backupS3Config ? backupS3Config : {
-          bucket: baasBucketName ? baasBucketName : `baas-${safeProjectName}`
-        },
+        s3: backupS3Config,
         repoPasswordSecretRef: {
           key: 'repo-pw',
           name: 'baas-repo-pw'
@@ -955,6 +953,10 @@ export const createMiscTask = async function(taskData: any) {
                 key: "secret-key"
               }
             }
+          } else {
+            backupS3Config = {
+              bucket: baasBucketName ? baasBucketName : `baas-${makeSafe(taskData.data.project.name)}`
+            }
           }
 
           // Handle custom restore configurations
@@ -1000,7 +1002,7 @@ export const createMiscTask = async function(taskData: any) {
           }
 
           // generate the restore CRD
-          const restoreConf = restoreConfig(restoreName, taskData.data.backup.backupId, makeSafe(taskData.data.project.name), baasBucketName, backupS3Config, restoreS3Config)
+          const restoreConf = restoreConfig(restoreName, taskData.data.backup.backupId, backupS3Config, restoreS3Config)
           //logger.info(restoreConf)
           // base64 encode it
           const restoreBytes = new Buffer(JSON.stringify(restoreConf).replace(/\\n/g, "\n")).toString('base64')