Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 643a58c

Browse files
committed
Folder and Link resource handling - refactor duplicate code
1 parent 4db71fc commit 643a58c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

routines/implementations.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,11 @@ var RollbackResources = Task{
134134
// return: bool: whether to consider resource group for requiring rollback ; error
135135
func processResourceGroup(taskRunner *TaskRunner, resourceGroup system.ResourceGroup, isRollbackMode bool, ignoreBackup bool) (bool, error) {
136136
var uncompletedSpinners []*ysmrr.Spinner
137-
var errors []error
138137

139138
// ROLLBACK mode
140139
if isRollbackMode && resourceGroup.RollbackResourceFunc != nil {
141140
if err := resourceGroup.RollbackResourceFunc(); err != nil {
142-
errors = append(errors, fmt.Errorf("Unable to completely rollback resources: %s", err))
141+
return false, err
143142
}
144143
}
145144

@@ -182,7 +181,7 @@ func processResourceGroup(taskRunner *TaskRunner, resourceGroup system.ResourceG
182181
for _, spinner := range uncompletedSpinners {
183182
spinner.Complete()
184183
}
185-
return true, nil
184+
return !isRollbackMode, nil
186185
}
187186

188187
var CreateResources = Task{

0 commit comments

Comments
 (0)