split config in two parts

Author: denik

bundle/direct/bundle_plan.go

@@ -379,7 +379,7 @@ func addPerFieldActions(ctx context.Context, adapter *dresources.Adapter, change
 			// Empty map in config should not cause drift when remote has values
 			ch.Action = deployplan.Skip
 			ch.Reason = deployplan.ReasonEmptyMap
-		} else if action := getActionFromConfig(cfg, pathString); action != deployplan.Undefined {
+		} else if action := shouldIgnore(cfg, pathString); action != deployplan.Undefined {
 			ch.Action = action
 			ch.Reason = deployplan.ReasonBuiltinRule
 		} else if ch.New == nil && ch.Old == nil && ch.Remote != nil && path.IsDotString() {
@@ -389,6 +389,9 @@ func addPerFieldActions(ctx context.Context, adapter *dresources.Adapter, change
 			// Note, we only consider struct fields here. Adding/removing elements to/from maps and slices should trigger updates.
 			ch.Action = deployplan.Skip
 			ch.Reason = deployplan.ReasonServerSideDefault
+		} else if action := shouldUpdateOrRecreate(cfg, pathString); action != deployplan.Undefined {
+			ch.Action = action
+			ch.Reason = deployplan.ReasonBuiltinRule
 		} else {
 			ch.Action = deployplan.Update
 		}
@@ -402,9 +405,7 @@ func addPerFieldActions(ctx context.Context, adapter *dresources.Adapter, change
 	return nil
 }
 
-// getActionFromConfig returns the action for a field path based on resource config.
-// Returns Undefined if no config applies.
-func getActionFromConfig(cfg *dresources.ResourceLifecycleConfig, pathString string) deployplan.ActionType {
+func shouldIgnore(cfg *dresources.ResourceLifecycleConfig, pathString string) deployplan.ActionType {
 	if cfg == nil {
 		return deployplan.Undefined
 	}
@@ -413,6 +414,13 @@ func getActionFromConfig(cfg *dresources.ResourceLifecycleConfig, pathString str
 			return deployplan.Skip
 		}
 	}
+	return deployplan.Undefined
+}
+
+func shouldUpdateOrRecreate(cfg *dresources.ResourceLifecycleConfig, pathString string) deployplan.ActionType {
+	if cfg == nil {
+		return deployplan.Undefined
+	}
 	for _, p := range cfg.RecreateOnChanges {
 		if structpath.HasPrefix(pathString, p.String()) {
 			return deployplan.Recreate