Cleanups

src/erldns_records.erl

@@ -129,8 +129,7 @@ match_delegation(Name) ->
 match_type_covered(Qtype) ->
     fun(#dns_rr{data = #dns_rrdata_rrsig{type_covered = TypeCovered}}) -> TypeCovered =:= Qtype end.
 
-%% Replacement functions.
-
+-spec replace_name(dns:dname()) -> fun((dns:rr()) -> dns:rr()).
 replace_name(Name) ->
     fun(#dns_rr{} = R) -> R#dns_rr{name = Name} end.
 

src/zones/erldns_zone_encoder.erl

@@ -17,16 +17,15 @@ encode(Zone, #{mode := {zone_records_to_json, RecordName, RecordType}}, Encoders
     encode_zone_records_to_json(Zone, RecordName, RecordType, Encoders);
 encode(Zone, #{mode := zone_to_json}, Encoders) ->
     Records = records_to_json(Zone, Encoders),
-    FilteredRecords = lists:filter(record_filter(), Records),
     #{
         ~"erldns" =>
             #{
                 ~"zone" => #{
                     ~"name" => Zone#zone.name,
                     ~"version" => Zone#zone.version,
-                    ~"records_count" => length(FilteredRecords),
+                    ~"records_count" => length(Records),
                     % Note: Private key material is purposely omitted
-                    ~"records" => FilteredRecords
+                    ~"records" => Records
                 }
             }
     }.
@@ -36,36 +35,28 @@ zone_meta_to_json(Zone) ->
     #{
         ~"erldns" =>
             #{
+                % Note: Private key material is purposely omitted
                 ~"zone" => #{
                     ~"name" => Zone#zone.name,
                     ~"version" => Zone#zone.version,
-                    % Note: Private key material is purposely omitted
-                    ~"records_count" => length(erldns_zone_cache:get_zone_records(Zone#zone.name))
+                    ~"records_count" => Zone#zone.record_count
                 }
             }
     }.
 
 % Internal API
 encode_zone_records_to_json(_ZoneName, RecordName, Encoders) ->
     Records = erldns_zone_cache:get_records_by_name(RecordName),
-    lists:filter(record_filter(), lists:map(encode(Encoders), Records)).
+    lists:flatmap(encode(Encoders), Records).
 
 encode_zone_records_to_json(_ZoneName, RecordName, RecordType, Encoders) ->
     Records = erldns_zone_cache:get_records_by_name_and_type(
         RecordName, dns_names:name_type(RecordType)
     ),
-    lists:filter(record_filter(), lists:map(encode(Encoders), Records)).
-
-record_filter() ->
-    fun(R) ->
-        case R of
-            not_implemented -> false;
-            _ -> true
-        end
-    end.
+    lists:flatmap(encode(Encoders), Records).
 
 records_to_json(Zone, Encoders) ->
-    lists:map(encode(Encoders), erldns_zone_cache:get_zone_records(Zone#zone.name)).
+    lists:flatmap(encode(Encoders), erldns_zone_cache:get_zone_records(Zone#zone.name)).
 
 encode(Encoders) ->
     fun(Record) -> encode_record(Record, Encoders) end.
@@ -75,7 +66,7 @@ encode_record(Record, Encoders) ->
         not_implemented ->
             try_custom_encoders(Record, Encoders);
         EncodedRecord ->
-            EncodedRecord
+            [EncodedRecord]
     end.
 
 encode_record(#dns_rr{name = Name, type = Type = ?DNS_TYPE_SOA, ttl = Ttl, data = Data}) ->
@@ -130,13 +121,13 @@ encode_record(Name, Type, Ttl, Data) ->
     }.
 
 try_custom_encoders(_, []) ->
-    not_implemented;
+    [];
 try_custom_encoders(Record, [Encoder | Rest]) ->
     case Encoder(Record) of
         not_implemented ->
             try_custom_encoders(Record, Rest);
         EncodedData ->
-            EncodedData
+            [EncodedData]
     end.
 
 encode_data(#dns_rrdata_soa{

test/dnssec_SUITE.erl

@@ -41,7 +41,7 @@ end_per_testcase(_, _Config) ->
     ok.
 
 verify_ksk_signed(_) ->
-    Name = <<"example-dnssec0.com">>,
+    Name = dns:dname_to_lower(~"example-dnssec0.com"),
     QType = ?DNS_TYPE_A,
     Q = #dns_query{name = Name, type = QType},
     A = #dns_rr{name = Name, type = QType, data = #dns_rrdata_a{ip = {1, 2, 3, 4}}},
@@ -70,17 +70,17 @@ verify_ksk_signed(_) ->
     ).
 
 verify_zsk_signed(_) ->
-    Name = <<"example-dnssec0.com">>,
+    Name = dns:dname_to_lower(~"example-dnssec0.com"),
     QType = ?DNS_TYPE_CDNSKEY,
     CDSRecord = #dns_rr{
-        name = <<"example.com">>,
+        name = ~"example.com",
         type = ?DNS_TYPE_CDNSKEY,
         ttl = 120,
         data = #dns_rrdata_cds{
             keytag = 0,
             alg = 0,
             digest_type = 0,
-            digest = <<"00">>
+            digest = ~"00"
         }
     },
 
@@ -114,33 +114,33 @@ verify_zsk_signed(_) ->
 test_requires_key_signing_key_function(_Config) ->
     % Test CDS record
     CDSRecord = #dns_rr{
-        name = <<"example.com">>,
+        name = ~"example.com",
         type = ?DNS_TYPE_CDS,
         ttl = 120,
         data = #dns_rrdata_cds{
             keytag = 12345,
             alg = 8,
             digest_type = 2,
-            digest = <<"abcdef1234567890">>
+            digest = ~"abcdef1234567890"
         }
     },
 
     % Test CDNSKEY record
     CDNSKEYRecord = #dns_rr{
-        name = <<"example.com">>,
+        name = ~"example.com",
         type = ?DNS_TYPE_CDNSKEY,
         ttl = 120,
         data = #dns_rrdata_dnskey{
             flags = 257,
             protocol = 3,
             alg = 8,
-            public_key = <<"test_public_key">>
+            public_key = ~"test_public_key"
         }
     },
 
     % Test A record
     ARecord = #dns_rr{
-        name = <<"example.com">>,
+        name = ~"example.com",
         type = ?DNS_TYPE_A,
         ttl = 300,
         data = #dns_rrdata_a{ip = {192, 168, 1, 1}}
@@ -164,7 +164,7 @@ test_requires_key_signing_key_function(_Config) ->
 
 %% Test the signer selection logic in choose_signer_for_rrset
 test_signer_selection_logic(_Config) ->
-    ZoneName = <<"example.com">>,
+    ZoneName = ~"example.com",
 
     % Test CDS record should use key signer
     CDSRecord = #dns_rr{
@@ -175,7 +175,7 @@ test_signer_selection_logic(_Config) ->
             keytag = 12345,
             alg = 8,
             digest_type = 2,
-            digest = <<"abcdef1234567890">>
+            digest = ~"abcdef1234567890"
         }
     },
 
@@ -188,7 +188,7 @@ test_signer_selection_logic(_Config) ->
             flags = 257,
             protocol = 3,
             alg = 8,
-            public_key = <<"test_public_key">>
+            public_key = ~"test_public_key"
         }
     },
 

test/zones_SUITE.erl

@@ -19,6 +19,7 @@ all() ->
 groups() ->
     [
         {loader, [], [
+            loader_coverage,
             defaults,
             bad_config,
             strict_true,
@@ -71,11 +72,6 @@ end_per_suite(_) ->
     application:unset_env(erldns, zones).
 
 -spec init_per_group(ct_suite:ct_groupname(), ct_suite:ct_config()) -> ct_suite:ct_config().
-init_per_group(cache, Config) ->
-    meck:new(telemetry, [passthrough, no_link]),
-    Config;
-init_per_group(codec, Config) ->
-    Config;
 init_per_group(loader, Config) ->
     meck:new(erldns_zone_codec, [passthrough, no_link]),
     meck:expect(erldns_zone_codec, decode, fun(Term) -> Term end),
@@ -84,16 +80,15 @@ init_per_group(loader, Config) ->
         (false) -> {error, false};
         (Term) -> Term
     end),
+    Config;
+init_per_group(_, Config) ->
     Config.
 
 -spec end_per_group(ct_suite:ct_groupname(), ct_suite:ct_config()) -> term().
-end_per_group(codec, _Config) ->
-    ok;
-end_per_group(cache, _Config) ->
-    ?assert(meck:validate(telemetry)),
-    meck:unload();
 end_per_group(loader, _Config) ->
-    meck:unload().
+    meck:unload();
+end_per_group(_, _Config) ->
+    ok.
 
 -spec init_per_testcase(ct_suite:ct_testcase(), ct_suite:ct_config()) -> ct_suite:ct_config().
 init_per_testcase(_, Config) ->
@@ -150,10 +145,9 @@ custom_decode(_) ->
 encode_meta_to_json(_) ->
     {ok, _} = erldns_zone_cache:start_link(),
     {ok, _} = erldns_zone_codec:start_link(),
-    Z = #zone{
-        name = ~"example.com",
-        authority = [#dns_rr{name = ~"example.com", type = ?DNS_TYPE_SOA}]
-    },
+    ZoneName = dns:dname_to_lower(~"example.com"),
+    Z = erldns_zone_codec:build_zone(ZoneName, ~"", [], []),
+    erldns_zone_cache:put_zone(Z),
     Data = erldns_zone_codec:encode(Z, #{mode => zone_meta_to_json}),
     JSON = iolist_to_binary(json:encode(Data)),
     ?assert(is_binary(JSON)),
@@ -471,6 +465,12 @@ parse_json_keys_unsorted_proplists(_) ->
         ])
     ).
 
+loader_coverage(_) ->
+    erldns_zone_loader:start_link(),
+    gen_server:call(erldns_zone_loader, anything),
+    gen_server:cast(erldns_zone_loader, anything),
+    ?assert(erlang:is_process_alive(whereis(erldns_zone_loader))).
+
 defaults(_) ->
     ?assertEqual(0, erldns_zone_loader:load_zones()).