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

Adapt to changed Engine API #1143

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/Zonemaster/Backend/DB.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ use POSIX qw( strftime );
use Readonly;
use Try::Tiny;

use Zonemaster::Engine::Normalization;
use Zonemaster::Backend::Errors;
use Zonemaster::Engine::Normalization;
use Zonemaster::Engine::Logger::Entry;

requires qw(
Expand Down Expand Up @@ -875,7 +875,7 @@ sub process_dead_test {
sub _normalize_domain {
my ( $domain ) = @_;

my ( $errors, $normalized_domain ) = normalize_name( $domain );
my ( $errors, $normalized_domain ) = normalize_name( trim_space( $domain ) );

if ( scalar( @{$errors} ) ) {
die Zonemaster::Backend::Error::Internal->new( reason => "Normalizing domain returned errors.", data => [ map { $_->string } @{$errors} ] );
Expand Down
4 changes: 2 additions & 2 deletions lib/Zonemaster/Backend/RPCAPI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use Encode;

# Zonemaster Modules
use Zonemaster::Engine;
use Zonemaster::Engine::Normalization;
use Zonemaster::Engine::Normalization qw( normalize_name trim_space );
use Zonemaster::Engine::Profile;
use Zonemaster::Engine::Recursor;
use Zonemaster::Backend;
Expand Down Expand Up @@ -224,7 +224,7 @@ sub get_data_from_parent_zone {
my $result = eval {
my %result;
my $domain = $params->{domain};
my ( $_errors, $normalized_domain ) = normalize_name( $domain );
my ( $_errors, $normalized_domain ) = normalize_name( trim_space ( $domain ) );

my @ns_list;
my @ns_names;
Expand Down
4 changes: 2 additions & 2 deletions lib/Zonemaster/Backend/Validator.pm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use Readonly;
use Locale::TextDomain qw[Zonemaster-Backend];
use Net::IP::XS;
use Zonemaster::Engine::Logger::Entry;
use Zonemaster::Engine::Normalization;
use Zonemaster::Engine::Normalization qw( normalize_name trim_space );
use Zonemaster::LDNS;

our @EXPORT_OK = qw(
Expand Down Expand Up @@ -282,7 +282,7 @@ sub check_domain {
return N__ 'Domain name required';
}

my ( $errors, $_domain ) = normalize_name( $domain );
my ( $errors, $_domain ) = normalize_name( trim_space( $domain ) );

if ( @{$errors} ) {
return $errors->[0]->message;
Expand Down