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

Rename more message args #799

Merged
merged 12 commits into from
Oct 12, 2020
Merged

Rename more message args #799

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fde74e2
Fix message arg name mismatch
mattias-p Oct 2, 2020
b64d7f3
Rename message arg: addrs
mattias-p Oct 2, 2020
e4a87f1
Rename message arg: servers
mattias-p Oct 2, 2020
ee9076a
Rename message arg: glue
mattias-p Oct 2, 2020
00e719f
Rename message args: parent_addresses, zone_addresses
mattias-p Oct 2, 2020
00a844e
Rename message arg: addresses
mattias-p Oct 2, 2020
6820639
Refactor
mattias-p Oct 5, 2020
bda4006
Rename message arg: nsset
mattias-p Oct 5, 2020
02189bd
Rename message arg: names
mattias-p Oct 5, 2020
63228ac
Clarify usage of suffixes
mattias-p Oct 6, 2020
0a2c1a6
Revert suffixed argument names
mattias-p Oct 8, 2020
bf127cf
Rename nssset argument
mattias-p Oct 8, 2020
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
Prev Previous commit
Next Next commit
Revert suffixed argument names
  • Loading branch information
@mattias-p
mattias-p committed Oct 8, 2020
commit 0a2c1a64d13c8fc9854ec410471d96f22e7d6059
8 changes: 1 addition & 7 deletions docs/logentry_args.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@

## Aggregate list

This table contains prefixes of argument names. An optional suffix may be added
for disambiguation and/or clarity.
Suffixes must be in snake_case, they must start with an underscore, and it must
be unambiguous from the table where the base name ends and where the suffix
begins.

| Base name | Type of value | Description and formatting |
| Argument | Type of value | Description and formatting |
|-------------|----------------------|-------------------------------------------------------------|
| nsname | Domain name | The domain name of a name server. |
| ns_ip | IP address | The IP address of a name server. |
Expand Down
20 changes: 10 additions & 10 deletions lib/Zonemaster/Engine/Test/Consistency.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Readonly my %TAG_DESCRIPTIONS => (
IN_BAILIWICK_ADDR_MISMATCH => sub {
__x # CONSISTENCY:IN_BAILIWICK_ADDR_MISMATCH
'In-bailiwick name server listed at parent has a mismatch between glue data at parent '
. '({ns_list_parent}) and any equivalent address record in child zone ({ns_list_zone}).',
. '({parent_addresses}) and any equivalent address record in child zone ({zone_addresses}).',
@_;
},
IPV4_DISABLED => sub {
Expand Down Expand Up @@ -200,7 +200,7 @@ Readonly my %TAG_DESCRIPTIONS => (
},
NS_SET => sub {
__x # CONSISTENCY:NS_SET
'Saw NS set ({nsname_list_response}) on following nameserver set : {ns_list_servers}.', @_;
'Saw NS set ({nsset}) on following nameserver set : {servers}.', @_;
},
ONE_NS_SET => sub {
__x # CONSISTENCY:ONE_NS_SET
Expand All @@ -227,8 +227,8 @@ Readonly my %TAG_DESCRIPTIONS => (
OUT_OF_BAILIWICK_ADDR_MISMATCH => sub {
__x # CONSISTENCY:OUT_OF_BAILIWICK_ADDR_MISMATCH
'Out-of-bailiwick name server listed at parent with glue record has a mismatch between '
. 'the glue at the parent ({ns_list_parent}) and any equivalent address record found '
. 'in authoritative zone ({ns_list_zone}).', @_;
. 'the glue at the parent ({parent_addresses}) and any equivalent address record found '
. 'in authoritative zone ({zone_addresses}).', @_;
},
Copy link
Contributor

Choose a reason for hiding this comment

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

See comment above.

SOA_RNAME => sub {
__x # CONSISTENCY:SOA_RNAME
Expand Down Expand Up @@ -615,8 +615,8 @@ sub consistency04 {
push @results,
info(
NS_SET => {
nsname_list_response => $ns_set,
ns_list_servers => join( q{;}, @{ $ns_sets{$ns_set} } ),
nsset => $ns_set,
servers => join( q{;}, @{ $ns_sets{$ns_set} } ),
}
);
}
Expand Down Expand Up @@ -731,8 +731,8 @@ sub consistency05 {
push @results,
info(
IN_BAILIWICK_ADDR_MISMATCH => {
ns_list_parent => join( q{;}, sort keys %strict_glue ),
ns_list_zone => join( q{;}, sort keys %child_ib_strings ),
parent_addresses => join( q{;}, sort keys %strict_glue ),
zone_addresses => join( q{;}, sort keys %child_ib_strings ),
}
);
}
Expand Down Expand Up @@ -772,8 +772,8 @@ sub consistency05 {
push @results,
info(
OUT_OF_BAILIWICK_ADDR_MISMATCH => {
ns_list_parent => join( q{;}, sort @glue_strings ),
ns_list_zone => join( q{;}, sort keys %child_oob_strings ),
parent_addresses => join( q{;}, sort @glue_strings ),
zone_addresses => join( q{;}, sort keys %child_oob_strings ),
}
);
}
Expand Down