From 039cd00a9acfacd3a5a304be09bf17debd54aaaf Mon Sep 17 00:00:00 2001
From: shisama <shisama07@gmail.com>
Date: Tue, 21 Apr 2020 04:46:26 +0900
Subject: [PATCH] dns: add dns/promises alias

PR-URL: https://github.com/nodejs/node/pull/32953
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 doc/api/dns.md                                |  2 +-
 lib/dns/promises.js                           |  5 +++
 node.gyp                                      |  1 +
 test/es-module/test-esm-dns-promises.mjs      | 14 ++++++++
 test/parallel/test-dns-promises-exists.js     |  6 ++++
 .../test-dns-setservers-type-check.js         | 33 +++++++++++++++++++
 6 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 lib/dns/promises.js
 create mode 100644 test/es-module/test-esm-dns-promises.mjs
 create mode 100644 test/parallel/test-dns-promises-exists.js

diff --git a/doc/api/dns.md b/doc/api/dns.md
index 030bb7674b0..f6b8dbd3c0e 100644
--- a/doc/api/dns.md
+++ b/doc/api/dns.md
@@ -611,7 +611,7 @@ earlier ones time out or result in some other error.
 
 The `dns.promises` API provides an alternative set of asynchronous DNS methods
 that return `Promise` objects rather than using callbacks. The API is accessible
-via `require('dns').promises`.
+via `require('dns').promises` or `require('dns/promises')`.
 
 ### Class: `dnsPromises.Resolver`
 <!-- YAML
diff --git a/lib/dns/promises.js b/lib/dns/promises.js
new file mode 100644
index 00000000000..ad8a2561ef5
--- /dev/null
+++ b/lib/dns/promises.js
@@ -0,0 +1,5 @@
+'use strict';
+
+const dnsPromises = require('internal/dns/promises');
+dnsPromises.setServers = require('dns').setServers;
+module.exports = dnsPromises;
diff --git a/node.gyp b/node.gyp
index 2c1a26c28cc..73339c96371 100644
--- a/node.gyp
+++ b/node.gyp
@@ -48,6 +48,7 @@
       'lib/cluster.js',
       'lib/dgram.js',
       'lib/dns.js',
+      'lib/dns/promises.js',
       'lib/domain.js',
       'lib/events.js',
       'lib/fs.js',
diff --git a/test/es-module/test-esm-dns-promises.mjs b/test/es-module/test-esm-dns-promises.mjs
new file mode 100644
index 00000000000..7400e368025
--- /dev/null
+++ b/test/es-module/test-esm-dns-promises.mjs
@@ -0,0 +1,14 @@
+// Flags: --expose-internals
+import '../common/index.mjs';
+import assert from 'assert';
+import { lookupService } from 'dns/promises';
+
+const invalidAddress = 'fasdfdsaf';
+
+assert.throws(() => {
+  lookupService(invalidAddress, 0);
+}, {
+  code: 'ERR_INVALID_OPT_VALUE',
+  name: 'TypeError',
+  message: `The value "${invalidAddress}" is invalid for option "address"`
+});
diff --git a/test/parallel/test-dns-promises-exists.js b/test/parallel/test-dns-promises-exists.js
new file mode 100644
index 00000000000..5fd20dff2c1
--- /dev/null
+++ b/test/parallel/test-dns-promises-exists.js
@@ -0,0 +1,6 @@
+'use strict';
+
+require('../common');
+const assert = require('assert');
+
+assert.strictEqual(require('dns/promises'), require('dns').promises);
diff --git a/test/parallel/test-dns-setservers-type-check.js b/test/parallel/test-dns-setservers-type-check.js
index 9f09ee4ebf6..beb8f484eff 100644
--- a/test/parallel/test-dns-setservers-type-check.js
+++ b/test/parallel/test-dns-setservers-type-check.js
@@ -85,3 +85,36 @@ const promiseResolver = new dns.promises.Resolver();
     );
   });
 }
+
+// This test for 'dns/promises'
+{
+  const {
+    setServers
+  } = require('dns/promises');
+
+  // This should not throw any error.
+  (async () => {
+    setServers([ '127.0.0.1' ]);
+  })();
+
+  [
+    [null],
+    [undefined],
+    [Number(addresses.DNS4_SERVER)],
+    [
+      {
+        address: addresses.DNS4_SERVER
+      }
+    ]
+  ].forEach((val) => {
+    const errObj = {
+      code: 'ERR_INVALID_ARG_TYPE',
+      name: 'TypeError',
+      message: 'The "servers[0]" argument must be of type string.' +
+              common.invalidArgTypeHelper(val[0])
+    };
+    assert.throws(() => {
+      setServers(val);
+    }, errObj);
+  });
+}