WL#15434: update 3rd-party dependencies for 8.0.32

ruiquelhas · ruiquelhas · commit 3b02a1302dda · 2022-10-12T15:44:51.000+01:00
This patch updates all 3rd-party dependencies with new released versions
that are compatible with the current minimum required Node.js version
(v14.0.0).

As part of the "google-protobuf" update, the X Protocol stubs have been
re-generated using the corresponding version of the compiler.

The latest version of "dns2" also introduces a few breaking changes
which lead to a few small changes in the test suite.

Change-Id: Ia0dade4e2bb256ffebb7abdf6b67255257dffad7
diff --git a/lib/Protocol/Stubs/mysqlx_connection_pb.js b/lib/Protocol/Stubs/mysqlx_connection_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_datatypes_pb = require('./mysqlx_datatypes_pb.js');
 goog.object.extend(proto, mysqlx_datatypes_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_crud_pb.js b/lib/Protocol/Stubs/mysqlx_crud_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_cursor_pb.js b/lib/Protocol/Stubs/mysqlx_cursor_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_datatypes_pb.js b/lib/Protocol/Stubs/mysqlx_datatypes_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 goog.exportSymbol('proto.Mysqlx.Datatypes.Any', null, global);
 goog.exportSymbol('proto.Mysqlx.Datatypes.Any.Type', null, global);
diff --git a/lib/Protocol/Stubs/mysqlx_expect_pb.js b/lib/Protocol/Stubs/mysqlx_expect_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_expr_pb.js b/lib/Protocol/Stubs/mysqlx_expr_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_datatypes_pb = require('./mysqlx_datatypes_pb.js');
 goog.object.extend(proto, mysqlx_datatypes_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_notice_pb.js b/lib/Protocol/Stubs/mysqlx_notice_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_pb.js b/lib/Protocol/Stubs/mysqlx_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var google_protobuf_descriptor_pb = require('google-protobuf/google/protobuf/descriptor_pb.js');
 goog.object.extend(proto, google_protobuf_descriptor_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_prepare_pb.js b/lib/Protocol/Stubs/mysqlx_prepare_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_resultset_pb.js b/lib/Protocol/Stubs/mysqlx_resultset_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_session_pb.js b/lib/Protocol/Stubs/mysqlx_session_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/lib/Protocol/Stubs/mysqlx_sql_pb.js b/lib/Protocol/Stubs/mysqlx_sql_pb.js
@@ -32,15 +32,24 @@
 /**
  * @fileoverview
  * @enhanceable
+ * @suppress {missingRequire} reports error on implicit type usages.
  * @suppress {messageConventions} JS Compiler reports an error if a variable or
  *     field starts with 'MSG_' and isn't a translatable message.
  * @public
  */
 // GENERATED CODE -- DO NOT EDIT!
+/* eslint-disable */
+// @ts-nocheck
 
 var jspb = require('google-protobuf');
 var goog = jspb;
-var global = Function('return this')();
+var global =
+    (typeof globalThis !== 'undefined' && globalThis) ||
+    (typeof window !== 'undefined' && window) ||
+    (typeof global !== 'undefined' && global) ||
+    (typeof self !== 'undefined' && self) ||
+    (function () { return this; }).call(null) ||
+    Function('return this')();
 
 var mysqlx_pb = require('./mysqlx_pb.js');
 goog.object.extend(proto, mysqlx_pb);
diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "test:types": "tsd"
   },
   "dependencies": {
-    "google-protobuf": "3.19.4",
+    "google-protobuf": "3.21.2",
     "parsimmon": "1.18.1"
   },
   "engines": {
@@ -72,12 +72,12 @@
   "devDependencies": {
     "@types/node": "17.0.21",
     "@typescript-eslint/eslint-plugin": "4.33.0",
-    "chai": "4.3.4",
-    "dns2": "1.4.2",
+    "chai": "4.3.6",
+    "dns2": "2.0.5",
     "eslint-config-standard-with-typescript": "21.0.1",
     "eslint-plugin-header": "3.1.0",
     "eslint-plugin-tsdoc": "0.2.14",
-    "mocha": "8.2.1",
+    "mocha": "10.0.0",
     "nyc": "15.1.0",
     "snazzy": "9.0.0",
     "standardx": "7.0.0",
diff --git a/test/fixtures/createRecordServer.js b/test/fixtures/createRecordServer.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2.0, as
@@ -35,7 +35,9 @@ const dns = require('dns2');
 const { Packet } = dns;
 
 module.exports = function ({ host = '127.0.0.1', service, records = [] }) {
-    const dnsServer = dns.createServer((request, send) => {
+    const dnsServer = dns.createServer({ udp: true });
+
+    dnsServer.on('request', (request, send) => {
         const response = Packet.createResponseFromRequest(request);
         const [question] = request.questions;
         const { name } = question;
@@ -58,6 +60,6 @@ module.exports = function ({ host = '127.0.0.1', service, records = [] }) {
         send(response);
     });
 
-    return dnsServer.listen(0, host)
+    return dnsServer.listen({ udp: { address: host } })
         .then(() => dnsServer);
 };
diff --git a/test/functional/default/connection/dns-srv.js b/test/functional/default/connection/dns-srv.js
@@ -90,7 +90,9 @@ describe('connecting to the MySQL server using DNS SRV', () => {
         beforeEach('add fake server to list of servers to be used for DNS resolution', () => {
             // Save the original list of DNS servers to restore after the test.
             originalServers = dns.getServers();
-            dns.setServers([`${fakeServer.address().address}:${fakeServer.address().port}`].concat(originalServers));
+            // Add the fake server endpoint to the list of DNS servers.
+            const { address, port } = fakeServer.addresses().udp;
+            dns.setServers([`${address}:${port}`].concat(originalServers));
         });
 
         afterEach('restore original list of DNS servers', () => {
@@ -133,7 +135,9 @@ describe('connecting to the MySQL server using DNS SRV', () => {
         beforeEach('add fake server to list of servers to be used for DNS resolution', () => {
             // Save the original list of DNS servers to restore after the test.
             originalServers = dns.getServers();
-            dns.setServers([`${fakeServer.address().address}:${fakeServer.address().port}`].concat(originalServers));
+            // Add the fake server endpoint to the list of DNS servers.
+            const { address, port } = fakeServer.addresses().udp;
+            dns.setServers([`${address}:${port}`].concat(originalServers));
         });
 
         afterEach('restore original list of DNS servers', () => {
