Fix ignore_{remote,local}_changes setting in resource.yml (#4388)

## Changes
- Fix ignore_remote_changes to ignoring only remote changes (it was
ignoring all on a given path).
- Respect ignore_local_changes setting.

Currently, few resources use it (experiments, database_catalogs,
synced_database_tables since
#4364).

Follow up to #4304

## Tests
Existing. I have follow up PRs that make more use of
ignore_remote_changes which make this bug apparent.

Author: denik

NEXT_CHANGELOG.md

@@ -9,6 +9,7 @@
 ### Bundles
 
 * Add missing values to SchemaGrantPrivilege enum ([#4380](https://github.com/databricks/cli/pull/4380))
+* engine/direct: Fix updates to fields being ignored for database_catalogs, synced_database_tables (([#4388](https://github.com/databricks/cli/pull/4388)))
 
 ### Dependency updates
 

bundle/direct/bundle_plan.go

@@ -383,8 +383,8 @@ func addPerFieldActions(ctx context.Context, adapter *dresources.Adapter, change
 			// Empty struct in config should not cause drift when remote has values
 			ch.Action = deployplan.Skip
 			ch.Reason = deployplan.ReasonEmptyStruct
-		} else if action := shouldIgnore(cfg, path); action != deployplan.Undefined {
-			ch.Action = action
+		} else if shouldSkip(cfg, path, ch) {
+			ch.Action = deployplan.Skip
 			ch.Reason = deployplan.ReasonBuiltinRule
 		} else if ch.New == nil && ch.Old == nil && ch.Remote != nil && path.IsDotString() {
 			// The field was not set by us, but comes from the remote state.
@@ -419,31 +419,37 @@ func addPerFieldActions(ctx context.Context, adapter *dresources.Adapter, change
 	return nil
 }
 
-func shouldIgnore(cfg *dresources.ResourceLifecycleConfig, path *structpath.PathNode) deployplan.ActionType {
-	if cfg == nil {
-		return deployplan.Undefined
-	}
-	for _, p := range cfg.IgnoreRemoteChanges {
+func matchesAnyPrefix(path *structpath.PathNode, prefixes []*structpath.PathNode) bool {
+	for _, p := range prefixes {
 		if path.HasPrefix(p) {
-			return deployplan.Skip
+			return true
 		}
 	}
-	return deployplan.Undefined
+	return false
+}
+
+func shouldSkip(cfg *dresources.ResourceLifecycleConfig, path *structpath.PathNode, ch *deployplan.ChangeDesc) bool {
+	if cfg == nil {
+		return false
+	}
+	if matchesAnyPrefix(path, cfg.IgnoreLocalChanges) && !structdiff.IsEqual(ch.Old, ch.New) {
+		return true
+	}
+	if matchesAnyPrefix(path, cfg.IgnoreRemoteChanges) && structdiff.IsEqual(ch.Old, ch.New) {
+		return true
+	}
+	return false
 }
 
 func shouldUpdateOrRecreate(cfg *dresources.ResourceLifecycleConfig, path *structpath.PathNode) deployplan.ActionType {
 	if cfg == nil {
 		return deployplan.Undefined
 	}
-	for _, p := range cfg.RecreateOnChanges {
-		if path.HasPrefix(p) {
-			return deployplan.Recreate
-		}
+	if matchesAnyPrefix(path, cfg.RecreateOnChanges) {
+		return deployplan.Recreate
 	}
-	for _, p := range cfg.UpdateIDOnChanges {
-		if path.HasPrefix(p) {
-			return deployplan.UpdateWithID
-		}
+	if matchesAnyPrefix(path, cfg.UpdateIDOnChanges) {
+		return deployplan.UpdateWithID
 	}
 	return deployplan.Undefined
 }

bundle/direct/dresources/resources.yml

@@ -40,6 +40,8 @@ resources:
     ignore_remote_changes:
       # Tags updates are not supported by TF. This mirrors that behaviour.
       - tags
+    ignore_local_changes:
+      - tags
 
   # TF implementation: https://github.com/databricks/terraform-provider-databricks/blob/6c106e8e7052bb2726148d66309fd460ed444236/mlflow/resource_mlflow_experiment.go#L22
   model_serving_endpoints: