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

---
 doc/api/dns.md                            |  2 +-
 lib/dns/promises.js                       |  3 +++
 node.gyp                                  |  1 +
 test/es-module/test-esm-dns-promises.mjs  | 14 ++++++++++++++
 test/parallel/test-dns-promises-exists.js |  6 ++++++
 5 files changed, 25 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 030bb7674b0cca..f6b8dbd3c0e96e 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 00000000000000..35881e5bb47374
--- /dev/null
+++ b/lib/dns/promises.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('internal/dns/promises');
diff --git a/node.gyp b/node.gyp
index c3ffd2ff2147e2..d4ae99ac67b5c7 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 00000000000000..7400e368025bf6
--- /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 00000000000000..5fd20dff2c12d2
--- /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);

From 4bfbeffec25bccd5ebb96e6f6d3055e8810be3be Mon Sep 17 00:00:00 2001
From: shisama <shisama07@gmail.com>
Date: Tue, 28 Apr 2020 23:54:15 +0900
Subject: [PATCH 2/3] dns: Add setServers into 'dns/promises'

---
 lib/dns/promises.js                           |  4 ++-
 .../test-dns-setservers-type-check.js         | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/dns/promises.js b/lib/dns/promises.js
index 35881e5bb47374..ad8a2561ef51e4 100644
--- a/lib/dns/promises.js
+++ b/lib/dns/promises.js
@@ -1,3 +1,5 @@
 'use strict';
 
-module.exports = require('internal/dns/promises');
+const dnsPromises = require('internal/dns/promises');
+dnsPromises.setServers = require('dns').setServers;
+module.exports = dnsPromises;
diff --git a/test/parallel/test-dns-setservers-type-check.js b/test/parallel/test-dns-setservers-type-check.js
index 9f09ee4ebf6519..fe05b6c2359c70 100644
--- a/test/parallel/test-dns-setservers-type-check.js
+++ b/test/parallel/test-dns-setservers-type-check.js
@@ -85,3 +85,38 @@ const promiseResolver = new dns.promises.Resolver();
     );
   });
 }
+
+// This test for 'dns/promises'
+{
+  const {
+    setServers,
+    resolve
+  } = require('dns/promises');
+
+  // This should not throw any error.
+  (async () => {
+    const localhost = await resolve('localhost');
+    setServers(localhost);
+  })();
+
+  [
+    [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);
+  });
+}

From 44dea356f512f812d68174b4260c29fecde3f799 Mon Sep 17 00:00:00 2001
From: shisama <shisama07@gmail.com>
Date: Wed, 6 May 2020 14:05:27 +0900
Subject: [PATCH 3/3] test: fix dns/promises test

---
 test/parallel/test-dns-setservers-type-check.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/parallel/test-dns-setservers-type-check.js b/test/parallel/test-dns-setservers-type-check.js
index fe05b6c2359c70..beb8f484effa79 100644
--- a/test/parallel/test-dns-setservers-type-check.js
+++ b/test/parallel/test-dns-setservers-type-check.js
@@ -89,14 +89,12 @@ const promiseResolver = new dns.promises.Resolver();
 // This test for 'dns/promises'
 {
   const {
-    setServers,
-    resolve
+    setServers
   } = require('dns/promises');
 
   // This should not throw any error.
   (async () => {
-    const localhost = await resolve('localhost');
-    setServers(localhost);
+    setServers([ '127.0.0.1' ]);
   })();
 
   [