Address review comments

Author: alexott

pipelines/resource_pipeline.go

@@ -340,34 +340,17 @@ func ResourcePipeline() common.Resource {
 			// Allow changing catalog value in existing pipelines, but force recreation
 			// when switching between storage and catalog (or vice versa).
 			// This should only run on update, thus we skip this check if the ID is not known.
-			if d.Id() != "" {
-				storageChanged := d.HasChange("storage")
-				catalogChanged := d.HasChange("catalog")
-
-				// If both changed, it means we're switching between storage and catalog modes
-				if storageChanged && catalogChanged {
-					oldStorage, newStorage := d.GetChange("storage")
-					oldCatalog, newCatalog := d.GetChange("catalog")
-
-					// Force new if switching from storage to catalog
-					if oldStorage != "" && oldStorage != nil && newCatalog != "" && newCatalog != nil {
-						if err := d.ForceNew("catalog"); err != nil {
-							return err
-						}
-						if err := d.ForceNew("storage"); err != nil {
-							return err
-						}
-					}
-
-					// Force new if switching from catalog to storage
-					if oldCatalog != "" && oldCatalog != nil && newStorage != "" && newStorage != nil {
-						if err := d.ForceNew("catalog"); err != nil {
-							return err
-						}
-						if err := d.ForceNew("storage"); err != nil {
-							return err
-						}
-					}
+			if d.Id() == "" {
+				return nil
+			}
+
+			// If both storage and catalog changed, it means we're switching between storage and catalog modes
+			if d.HasChange("storage") && d.HasChange("catalog") {
+				if err := d.ForceNew("catalog"); err != nil {
+					return err
+				}
+				if err := d.ForceNew("storage"); err != nil {
+					return err
 				}
 			}
 			return nil