Skip to content

Add PG name where CS is added #24

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
May 12, 2025
Merged

Add PG name where CS is added #24

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
17 changes: 16 additions & 1 deletion 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 @@ -58,6 +58,7 @@ public class FlowDiff {

private static String flowName;
private static Map<String, VersionedParameterContext> parameterContexts;
private static Map<String, VersionedProcessGroup> processGroups;

public static void main(String[] args) throws IOException {

Expand Down Expand Up @@ -98,8 +99,9 @@ public static void main(String[] args) throws IOException {
printConfigurableExtensionProperties(proc);
} else if (diff.getComponentB().getComponentType().equals(ComponentType.CONTROLLER_SERVICE)) {
final VersionedControllerService cs = (VersionedControllerService) diff.getComponentB();
final String pgName = processGroups.get(cs.getGroupIdentifier()).getName();
System.out.println("- A " + printComponent(diff.getComponentB())
+ " has been added with the below properties:");
+ " has been added in Process Group `" + pgName + "` with the below properties:");
printConfigurableExtensionProperties(cs);
} else if (diff.getComponentB().getComponentType().equals(ComponentType.LABEL)) {
final VersionedLabel label = (VersionedLabel) diff.getComponentB();
Expand Down Expand Up @@ -415,6 +417,11 @@ public static Set<FlowDifference> getDiff(final String pathA, final String pathB
final FlowSnapshotContainer snapshotA = getFlowContainer(pathA, factory);
final FlowSnapshotContainer snapshotB = getFlowContainer(pathB, factory);

processGroups = new HashMap<>();
VersionedProcessGroup rootPG = snapshotB.getFlowSnapshot().getFlowContents();
processGroups.put(rootPG.getIdentifier(), rootPG);
registerProcessGroups(rootPG);

// identifier is null for parameter contexts, and we know that names are unique so setting name as id
snapshotA.getFlowSnapshot().getParameterContexts().values().forEach(pc -> pc.setIdentifier(pc.getName()));
snapshotB.getFlowSnapshot().getParameterContexts().values().forEach(pc -> pc.setIdentifier(pc.getName()));
Expand Down Expand Up @@ -469,6 +476,14 @@ public int compare(FlowDifference o1, FlowDifference o2) {
return sortedDiffs;
}

private static void registerProcessGroups(VersionedProcessGroup rootPG) {
Set<VersionedProcessGroup> childPGs = rootPG.getProcessGroups();
for (VersionedProcessGroup pg : childPGs) {
processGroups.put(pg.getIdentifier(), pg);
registerProcessGroups(pg);
}
}

static FlowSnapshotContainer getFlowContainer(final String path, final JsonFactory factory) throws IOException {
final File snapshotFile = new File(path);
try (final JsonParser parser = factory.createParser(snapshotFile)) {
Expand Down