dns: return TypeError on invalid resolve() input

Synchronize the argument list for `dns.resolve()` with what's in the documentation. Improve the error for a bad `rrtype` to be a `TypeError` rather than an `Error`. PR-URL: #13090 Reviewed-By: Roman Reiss <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
nodejs · May 29, 2017 · 758a17f · 758a17f
1 parent a94b98e
commit 758a17f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lib/dns.js b/lib/dns.js
@@ -291,22 +291,21 @@ resolveMap.NAPTR = resolver('queryNaptr');
 resolveMap.SOA = resolver('querySoa');
 
 
-function resolve(hostname, type_, callback_) {
-  var resolver, callback;
-  if (typeof type_ === 'string') {
-    resolver = resolveMap[type_];
-    callback = callback_;
-  } else if (typeof type_ === 'function') {
+function resolve(hostname, rrtype, callback) {
+  var resolver;
+  if (typeof rrtype === 'string') {
+    resolver = resolveMap[rrtype];
+  } else if (typeof rrtype === 'function') {
     resolver = resolveMap.A;
-    callback = type_;
+    callback = rrtype;
   } else {
-    throw new Error('"type" argument must be a string');
+    throw new TypeError('"rrtype" argument must be a string');
   }
 
   if (typeof resolver === 'function') {
     return resolver(hostname, callback);
   } else {
-    throw new Error(`Unknown type "${type_}"`);
+    throw new Error(`Unknown type "${rrtype}"`);
   }
 }
 

diff --git a/test/parallel/test-dns.js b/test/parallel/test-dns.js
@@ -91,10 +91,8 @@ assert.doesNotThrow(() => dns.setServers([]));
 assert.deepStrictEqual(dns.getServers(), []);
 
 assert.throws(() => {
-  dns.resolve('test.com', [], common.mustNotCall());
-}, function(err) {
-  return !(err instanceof TypeError);
-}, 'Unexpected error');
+  dns.resolve('example.com', [], common.mustNotCall());
+}, /^TypeError: "rrtype" argument must be a string$/);
 
 // dns.lookup should accept only falsey and string values
 {