Skip to content

Improve display of VersionedFlowCoordinates changes #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
Merged

Improve display of VersionedFlowCoordinates changes #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions flow-diff/src/main/java/com/snowflake/openflow/FlowDiff.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
Expand Down Expand Up @@ -660,27 +661,25 @@ static void printConnection(final VersionedConnection connection) {

static String printVFCChanges(VersionedFlowCoordinates vfcBefore, VersionedFlowCoordinates vfcAfter) {
List<String> changes = new ArrayList<>();
if (vfcBefore.getBranch() != vfcAfter.getBranch()) {
changes.add("branch changed from `" + vfcBefore.getBranch() + "` to `" + vfcAfter.getBranch() + "`");
}
if (vfcBefore.getFlowId() != vfcAfter.getFlowId()) {
changes.add("flow ID changed from `" + vfcBefore.getFlowId() + "` to `" + vfcAfter.getFlowId() + "`");
}
if (vfcBefore.getRegistryId() != vfcAfter.getRegistryId()) {
changes.add("registry ID changed from `" + vfcBefore.getRegistryId() + "` to `" + vfcAfter.getRegistryId() + "`");
}
if (vfcBefore.getVersion() != vfcAfter.getVersion()) {
changes.add("version changed from `" + vfcBefore.getVersion() + "` to `" + vfcAfter.getVersion() + "`");
}
if (vfcBefore.getBucketId() != vfcAfter.getBucketId()) {
changes.add("bucket ID changed from `" + vfcBefore.getBucketId() + "` to `" + vfcAfter.getBucketId() + "`");
}
if (vfcBefore.getStorageLocation() != vfcAfter.getStorageLocation()) {
changes.add("storage location changed from `" + vfcBefore.getStorageLocation() + "` to `" + vfcAfter.getStorageLocation() + "`");
}
processVFCChange(vfcBefore.getBranch(), vfcAfter.getBranch(), "branch", changes);
processVFCChange(vfcBefore.getBucketId(), vfcAfter.getBucketId(), "bucket", changes);
processVFCChange(vfcBefore.getFlowId(), vfcAfter.getFlowId(), "flow ID", changes);
processVFCChange(vfcBefore.getVersion(), vfcAfter.getVersion(), "version", changes);
processVFCChange(vfcBefore.getRegistryId(), vfcAfter.getRegistryId(), "registry ID", changes);
processVFCChange(vfcBefore.getStorageLocation(), vfcAfter.getStorageLocation(), "storage location", changes);
return String.join(", ", changes);
}

static void processVFCChange(String valueA, String valueB, String elementName, List<String> changes) {
if (Objects.equals(valueA, valueB)) {
if (valueA != null) {
changes.add(elementName + " unchanged (`" + valueA + "`)");
}
} else {
changes.add(elementName + " changed from `" + valueA + "` to `" + valueB + "`");
}
}

static String printFromTo(final String from, final String to) {
if (isMultiline(from) || isMultiline(to)) {
return "\n```\n" + from + "\n```\nto\n```\n" + to + "\n```";
Expand Down