Skip to content

Resource Diffs - #1572

Merged
josephjclark merged 7 commits into
frank/ofn-4553from
diff-resources
Oct 2, 2026
Merged

josephjclark merged 7 commits into
frank/ofn-4553from
diff-resources

Conversation

@josephjclark

Copy link
Copy Markdown
Collaborator

Enable resources to be diffed

Claude done it

@josephjclark
josephjclark merged commit a76544c into frank/ofn-4553 Oct 2, 2026
11 checks passed
@josephjclark
josephjclark deleted the diff-resources branch October 2, 2026 17:16
josephjclark added a commit that referenced this pull request Oct 2, 2026
* project: read and write channels via channels.yaml

* project: fix sandbox merge dropping channels and keep remote channel ids on merge

* cli: deploy channel changes and deletions, and clear stale channels.yaml on checkout

* project: track removed channels on merge and send them as deletes

Move channel delete detection out of the CLI deploy handler and into the project's merge step, so any caller of toAppState sends removed channels to Lightning as deletes.

* project: store channels under a channels key in resources.yaml instead of channels.yaml

* project: key resources.yaml channels by id with a required name

* project: match channels by their resources.yaml id so renames keep the channel

* Resource Diffs (#1572)

* restructure project-diff

* diff channels in project

* log resource diff in CLI

* changeset

* one more changeset for the road

* format

* simplify

---------

Co-authored-by: Joe Clark <joe@openfn.org>
josephjclark added a commit that referenced this pull request Oct 5, 2026
* Remove trigger.enabled (#1564)

* lexicon: remove trigger.enabled from spec

* update handling of trigger.enabled

* update version hash

* changeset

* remove log

* update version util and fix tests

* add notes to docs

* remove .only

* fix test

* update test

* fix integration test

* Support channels in v2 sync (#1566)

* project: read and write channels via channels.yaml

* project: fix sandbox merge dropping channels and keep remote channel ids on merge

* cli: deploy channel changes and deletions, and clear stale channels.yaml on checkout

* project: track removed channels on merge and send them as deletes

Move channel delete detection out of the CLI deploy handler and into the project's merge step, so any caller of toAppState sends removed channels to Lightning as deletes.

* project: store channels under a channels key in resources.yaml instead of channels.yaml

* project: key resources.yaml channels by id with a required name

* project: match channels by their resources.yaml id so renames keep the channel

* Resource Diffs (#1572)

* restructure project-diff

* diff channels in project

* log resource diff in CLI

* changeset

* one more changeset for the road

* format

* simplify

---------

Co-authored-by: Joe Clark <joe@openfn.org>

* No checkout after deploy (#1573)

* don't checkout after deploy

* test

* changeset

* fix test

* version

---------

Co-authored-by: Midigo Frank <39288959+midigofrank@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants