return directly from switch case in add_or_update_change.go

prashantrewar · Jul 13, 2020 · bfb08a4 · bfb08a4
1 parent 4b3ccbb
commit bfb08a4
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/pkg/kapp/clusterapply/add_or_update_change.go b/pkg/kapp/clusterapply/add_or_update_change.go
@@ -52,10 +52,7 @@ func (c AddOrUpdateChange) Apply() error {
 				return err
 			}
 
-			err = c.recordAppliedResource(createdRes)
-			if err != nil {
-				return err
-			}
+			return c.recordAppliedResource(createdRes)
 
 		case createStrategyFallbackOnUpdateAnnValue:
 			createdRes, err := c.identifiedResources.Create(newRes)
@@ -66,10 +63,7 @@ func (c AddOrUpdateChange) Apply() error {
 				return err
 			}
 
-			err = c.recordAppliedResource(createdRes)
-			if err != nil {
-				return err
-			}
+			return c.recordAppliedResource(createdRes)
 
 		default:
 			return fmt.Errorf("Unknown create strategy: %s", strategy)
@@ -93,10 +87,7 @@ func (c AddOrUpdateChange) Apply() error {
 				return err
 			}
 
-			err = c.recordAppliedResource(updatedRes)
-			if err != nil {
-				return err
-			}
+			return c.recordAppliedResource(updatedRes)
 
 		case updateStrategyFallbackOnReplaceAnnValue:
 			replaceIfIsInvalidErrFunc := func(err error) error {
@@ -114,20 +105,18 @@ func (c AddOrUpdateChange) Apply() error {
 				return replaceIfIsInvalidErrFunc(err)
 			}
 
-			err = c.recordAppliedResource(updatedRes)
-			if err != nil {
-				return err
-			}
+			return c.recordAppliedResource(updatedRes)
 
 		case updateStrategyAlwaysReplaceAnnValue:
 			return c.replace()
 
 		default:
 			return fmt.Errorf("Unknown update strategy: %s", strategy)
 		}
-	}
 
-	return nil
+	default:
+		return fmt.Errorf("Unknown add-or-update op: %s", op)
+	}
 }
 
 func (c AddOrUpdateChange) replace() error {