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

[TXT Registry] Fix Records() case handling #3912

Merged
merged 2 commits into from
Sep 15, 2023

Conversation

Sewci0
Copy link
Contributor

@Sewci0 Sewci0 commented Sep 4, 2023

There's an issue in Records() function in TXT Registry. When using templated affix, recordType will be passed in lowercase in:

key := endpoint.EndpointKey{
DNSName: endpointName,
RecordType: recordType,
SetIdentifier: record.SetIdentifier,
}

This will then fail to match against the computed key with uppercase recordType in:

key := endpoint.EndpointKey{
DNSName: dnsName,
RecordType: ep.RecordType,
SetIdentifier: ep.SetIdentifier,
}
// Handle both new and old registry format with the preference for the new one
labels, labelsExist := labelMap[key]
if !labelsExist && ep.RecordType != endpoint.RecordTypeAAAA {
key.RecordType = ""
labels, labelsExist = labelMap[key]
}
if labelsExist {
for k, v := range labels {
ep.Labels[k] = v
}
}

Surprisingly it wasn't caught by any of the existing tests. I've added few cases should capture that in the future.

Checklist

  • Unit tests updated

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 4, 2023
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 4, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @Sewci0. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 4, 2023
@Sewci0
Copy link
Contributor Author

Sewci0 commented Sep 4, 2023

It's a fix to: #3724. @johngmyers / @szuecs can you please take a look?

@johngmyers
Copy link
Contributor

/ok-to-test
/lgtm
/asssign @szuecs

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 4, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 4, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 5, 2023
@johngmyers
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 5, 2023
@Sewci0
Copy link
Contributor Author

Sewci0 commented Sep 6, 2023

/assign @szuecs

@johngmyers
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 15, 2023
@k8s-ci-robot k8s-ci-robot merged commit 7519a77 into kubernetes-sigs:master Sep 15, 2023
14 checks passed
@Sewci0 Sewci0 deleted the fix/txt-registry-case branch September 21, 2023 12:37
eugene-eeo pushed a commit to thg-ice/external-dns that referenced this pull request Oct 9, 2023
…case

[TXT Registry] Fix `Records()` case handling
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants