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.

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

The record got field names from the DNSKEY record by accident, fix this #1065

Merged
merged 4 commits into from
Sep 23, 2023

Conversation

baest
Copy link

@baest baest commented Sep 18, 2023

Basically changing from
https://www.rfc-editor.org/rfc/rfc4034.html#section-2.1 to https://www.rfc-editor.org/rfc/rfc4034.html#section-5.1

So:
flags -> key_tag
protocol -> algorithm
algorithm -> digest_type
public_key -> digest

baest pushed a commit to baest/octodns-powerdns that referenced this pull request Sep 18, 2023
Also updated tests to add a new DS record for a sub zone along with updates since an existing DS records is now handled
Depends on octodns/octodns#1065
Copy link
Contributor

@ross ross left a comment

Choose a reason for hiding this comment

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

Thanks for the find & even more for the PR with the fixes. Comments inline. Once they're sorted we can move this forward.

octodns/record/ds.py Outdated Show resolved Hide resolved
octodns/record/ds.py Show resolved Hide resolved
tests/test_octodns_record_ds.py Show resolved Hide resolved
Copy link
Contributor

@ross ross left a comment

Choose a reason for hiding this comment

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

Added a DEPRECATION warning when the old fields are used so that we can eventually remove the backwards compat. I think this is gtg.

Thanks!

@ross
Copy link
Contributor

ross commented Sep 23, 2023

Ah. Once the integration tests run it caught an issue where the old property names are being accessed. That should be easy enough to fix.

https://github.com/octodns/octodns/actions/runs/6285771507/job/17068502376?pr=1065

@ross
Copy link
Contributor

ross commented Sep 23, 2023

So I was going to add back the "legacy" properties, but realized that algorithm is in both the old and new and that wouldn't work. Good news is that octodns-powerdns has never been released with DS support so we at least have options. I think we'll have to go about this a bit differently and reorder things a bit.

  1. Merge this change
  2. [ ] Once a release of octoDNS core has been made with DS fixes update octodns-powerdns to require >= that new release
  3. [ ] Merge Add support for the DS record (with updated field names) octodns-powerdns#50 to update octodns-powerdns to use the new values
  4. [ ] Cut a release of octodns-powerdns

Edit: reordered 2 & 3 as it looks like we'll need to cut a new release of core for octodns/octodns-powerdns#50 to require before it'll pass CI

@ross ross merged commit d477a53 into octodns:main Sep 23, 2023
30 of 31 checks passed
@ross
Copy link
Contributor

ross commented Sep 24, 2023

Scratch the last comment about process. After looking at the version checking patch I realized that the cleanest path forward would be to have octodns-powerdns just handle both ways transparently. Since there hasn't been a release with DS support yet that should be enough, octodns/octodns-powerdns#51 does this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants