Skip to content
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

Jump to bottom

feat: add branch support #202

Merged
merged 4 commits into from
Dec 16, 2024
Merged

feat: add branch support #202

merged 4 commits into from
Dec 16, 2024

Conversation

ltucker
Copy link
Contributor

@ltucker ltucker commented Dec 13, 2024 •
edited
Loading

Adds ability to specify netbox branch in applier/differ and netbox plugin client.
All automatic operations still default to main branch.

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 13, 2024 •
edited
Loading

Go test coverage

STATUS ELAPSED PACKAGE COVER PASS FAIL SKIP
🟢 PASS 0.00s github.com/netboxlabs/diode/diode-server/dbstore/postgres 0.0% 0 0 0
🟢 PASS 0.01s github.com/netboxlabs/diode/diode-server/gen/dbstore/postgres 0.0% 0 0 0
🟢 PASS 1.22s github.com/netboxlabs/diode/diode-server/ingester 71.2% 9 0 0
🟢 PASS 1.06s github.com/netboxlabs/diode/diode-server/migrator 68.2% 4 0 0
🟢 PASS 0.01s github.com/netboxlabs/diode/diode-server/netbox 0.0% 0 0 0
🟢 PASS 1.76s github.com/netboxlabs/diode/diode-server/netboxdiodeplugin 78.9% 42 0 0
🟢 PASS 1.44s github.com/netboxlabs/diode/diode-server/reconciler 85.0% 64 0 0
🟢 PASS 1.09s github.com/netboxlabs/diode/diode-server/reconciler/applier 88.9% 1 0 0
🟢 PASS 1.32s github.com/netboxlabs/diode/diode-server/reconciler/differ 80.9% 81 0 0
🟢 PASS 1.02s github.com/netboxlabs/diode/diode-server/server 85.7% 14 0 0
🟢 PASS 1.01s github.com/netboxlabs/diode/diode-server/version 100.0% 1 0 0

Total coverage: 79.5%

@ltucker ltucker marked this pull request as ready for review December 13, 2024 21:16
@mfiedorowicz mfiedorowicz changed the title feat: add branch support in applier, differ feat: add branch support Dec 16, 2024
mfiedorowicz
mfiedorowicz reviewed Dec 16, 2024
View reviewed changes
Copy link
Member

@mfiedorowicz mfiedorowicz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Luke, just a few minor comments to consider, other than that functionally looks great!

diode-server/netboxdiodeplugin/client.go Outdated Show resolved Hide resolved
diode-server/netboxdiodeplugin/client_test.go Outdated Show resolved Hide resolved
diode-server/reconciler/differ/differ.go Outdated Show resolved Hide resolved
@ltucker ltucker requested a review from mfiedorowicz December 16, 2024 14:12
mfiedorowicz
mfiedorowicz approved these changes Dec 16, 2024
View reviewed changes
Copy link
Member

@mfiedorowicz mfiedorowicz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks Luke!

@ltucker ltucker merged commit a8b8ef7 into develop Dec 16, 2024
3 checks passed
@ltucker ltucker deleted the branch_aware branch December 16, 2024 14:22
mfiedorowicz added a commit that referenced this pull request Dec 17, 2024
@ltucker @mfiedorowicz
feat: add branch support (#202)
57d9c37 
Co-authored-by: Michal Fiedorowicz <mfiedorowicz@netboxlabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfiedorowicz mfiedorowicz mfiedorowicz approved these changes

@leoparente leoparente Awaiting requested review from leoparente leoparente is a code owner

Assignees
No one assigned
Labels
diode-reconciler diode-server go
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ltucker @mfiedorowicz