[misc] add maxscale CI testing

Author: rusher

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ concurrency:
 env:
   TEST_DB_HOST: mariadb.example.com
   TEST_DB_PORT: 3306
-  TEST_DB_USER: root
+  TEST_DB_USER: testuser
   TEST_DB_PASSWORD: "heyPassw-!*20oRd"
   TEST_DB_DATABASE: testn
 jobs:
@@ -32,7 +32,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.final-matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - id: set-matrix
         name: build matrix
         uses: mariadb-corporation/connector-ci-build-matrix@main
@@ -49,13 +49,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.continue-on-error || false }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup Test Environment
         id: setup-env
         uses: mariadb-corporation/connector-ci-setup@master
         with:
-          node-version: ${{ matrix.node }}
           db-type: ${{ matrix.db-type }}
           db-tag: ${{ matrix.db-tag }}
           test-db-password: ${{ env.TEST_DB_PASSWORD }}
@@ -65,8 +64,9 @@ jobs:
           registry-user: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_USER || (secrets.DOCKER_TOKEN != '' && secrets.DOCKER_LOGIN || '') }}
           registry-password: ${{ matrix.db-type == 'enterprise' && secrets.ENTERPRISE_TOKEN || secrets.DOCKER_TOKEN }}
           os: ${{ matrix.os }}
+          maxscale-tag: ${{ matrix.maxscale-tag || ''}}
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         if: ${{ !matrix.deno }}
         with:
           node-version: ${{ matrix.node }}

test/base.js

@@ -21,7 +21,8 @@ export function isMaxscale(shareConn) {
     globalThis.maxscaleVersion = shareConn.info.maxscaleVersion;
     if (!maxscaleVersion) {
       // maxscale before 23.08
-      return getEnv('DB_TYPE') === 'maxscale' || getEnv('srv') === 'maxscale';
+      let maxscaletag = getEnv('maxscale-tag');
+      return maxscaletag != null && maxscaletag != '';
     }
   }
   return true;

test/integration/auth-plugin.test.js

@@ -652,6 +652,17 @@ describe.concurrent('authentication plugin', () => {
     } catch (e) {
       strictPasswordValidation = false;
     }
+    if (!strictPasswordValidation) {
+      try {
+        const res = await shareConn.query(
+          "SELECT * FROM information_schema.PLUGINS WHERE PLUGIN_NAME = 'simple_password_check' " +
+            "AND PLUGIN_STATUS = 'ACTIVE'"
+        );
+        if (res.length > 0) strictPasswordValidation = true;
+      } catch (e) {
+        // ignore
+      }
+    }
 
     await shareConn.query('drop user verifParsec' + getHostSuffix()).catch(() => {});
     await shareConn.query(

test/integration/batch.test.js

@@ -9,7 +9,7 @@ import os from 'node:os';
 import path from 'node:path';
 import Conf from '../conf.js';
 import ColumnDef from '../../lib/cmd/column-definition.js';
-import { createConnection, getEnv, utf8Collation } from '../base.js';
+import { createConnection, getEnv, isMaxscale, utf8Collation } from '../base.js';
 import { assert, describe, test, beforeAll, afterAll, beforeEach } from 'vitest';
 
 const str = utf8Collation() ? "abcdefghijkflmn'opqrtuvwx🤘💪" : 'abcdefghijkflmn\'opqrtuvwxyz"';
@@ -1429,6 +1429,7 @@ describe.sequential(
 
       test('technical option fullResult', async ({ skip }) => {
         if (!shareConn.info.isMariaDB() && !shareConn.info.hasMinVersion(5, 6, 0)) return skip();
+
         await shareConn.query('DROP TABLE IF EXISTS bufLength');
         await shareConn.query('create table bufLength (val varchar(32))');
         await shareConn.query('FLUSH TABLES');
@@ -1455,14 +1456,16 @@ describe.sequential(
         assert.deepEqual(res, { affectedRows: 4, insertId: 0n, warningStatus: 0 });
         await conn.end();
 
+        const supportBulkUnitResults = (shareConn.info.clientCapabilities & Capabilities.BULK_UNIT_RESULTS) > 0n;
+
         const connBulk = await createConnection({ bulk: true });
         res = await connBulk.batch('INSERT INTO bufLength VALUES (?)', [
           ['abc'],
           ['cde'],
           [1],
           [new Date('2001-12-31 23:59:58')]
         ]);
-        if (shareConn.info.hasMinVersion(11, 5, 1) || !shareConn.info.isMariaDB()) {
+        if (supportBulkUnitResults || !shareConn.info.isMariaDB()) {
           assert.deepEqual(res, [
             { affectedRows: 1, insertId: 0n, warningStatus: 0 },
             { affectedRows: 1, insertId: 0n, warningStatus: 0 },

test/integration/change-user.test.js

@@ -43,6 +43,7 @@ describe.concurrent('change user', () => {
 
   test('mysql change user error', async ({ skip }) => {
     if (shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     let logged = false;
     const conn = await createConnection({
       logger: {
@@ -81,6 +82,7 @@ describe.concurrent('change user', () => {
 
   test('basic change user using callback', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = createCallbackConnection();
     await new Promise((resolve, reject) => {
       conn.connect((err) => {
@@ -111,6 +113,7 @@ describe.concurrent('change user', () => {
 
   test('wrong charset', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     try {
       await conn.changeUser({
@@ -127,6 +130,7 @@ describe.concurrent('change user', () => {
 
   test('wrong collation in charset', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const tmpLogFile = path.join(os.tmpdir(), 'wrongCollation.txt');
     try {
       fs.unlinkSync(tmpLogFile);
@@ -167,6 +171,7 @@ describe.concurrent('change user', () => {
 
   test('wrong collation', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     try {
       await conn.changeUser({
@@ -183,6 +188,7 @@ describe.concurrent('change user', () => {
 
   test('basic change user using callback no function', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = createCallbackConnection();
     await new Promise((resolve, reject) => {
       conn.connect((err) => {
@@ -204,6 +210,7 @@ describe.concurrent('change user', () => {
 
   test('callback change user without option', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     await new Promise((resolve, reject) => {
       const conn = createCallbackConnection();
       conn.connect((err) => {
@@ -225,7 +232,7 @@ describe.concurrent('change user', () => {
 
   test('basic change user using promise', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
-
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     await conn.changeUser({
       user: 'ChangeUser',
@@ -248,7 +255,7 @@ describe.concurrent('change user', () => {
 
   test('change user using connection attributes', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
-
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection({ connectAttributes: { param1: 'test' } });
     await conn.changeUser({
       user: 'ChangeUser',
@@ -272,7 +279,7 @@ describe.concurrent('change user', () => {
 
   test('basic change user using promise non node.js encoding', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
-
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     await conn.changeUser({
       user: 'ChangeUser',
@@ -296,6 +303,7 @@ describe.concurrent('change user', () => {
 
   test('change user with collation', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     await conn.changeUser({
       user: 'ChangeUser',
@@ -311,6 +319,7 @@ describe.concurrent('change user', () => {
 
   test('MySQL change user disabled', async ({ skip }) => {
     if (shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     try {
       await shareConn.changeUser({ user: 'ChangeUser' });
       throw new Error('must have thrown an error');
@@ -321,6 +330,7 @@ describe.concurrent('change user', () => {
 
   test('autocommit state after changing user', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip();
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     assert.equal(conn.info.status & ServerStatus.STATUS_AUTOCOMMIT, 2);
     await conn.query('SET autocommit=1');
@@ -344,6 +354,7 @@ describe.concurrent('change user', () => {
 
   test('collation index > 255', async ({ skip }) => {
     if (!shareConn.info.isMariaDB()) return skip(); // requires mariadb 10.2+
+    if (isMaxscale(shareConn)) return skip();
     const conn = await createConnection();
     const res = await conn.query('SELECT @@COLLATION_CONNECTION as c');
     assert.notEqual(res[0].c, 'utf8mb4_unicode_520_nopad_ci');

test/integration/connection.test.js

@@ -335,14 +335,14 @@ describe.concurrent('connection', () => {
 
   test('connection.destroy() when executing', async () => {
     const conn = await createConnection();
-    conn.query('SELECT 1');
-    conn.destroy();
+    conn.query('SELECT 1').catch((err) => {});
+    await conn.destroy();
   }, 10000);
 
   test('connection.close alias', async () => {
     const conn = await createConnection({ keepAliveDelay: 100 });
-    conn.query('SELECT 1');
-    conn.close();
+    conn.query('SELECT 1').catch((err) => {});
+    await conn.close();
   }, 10000);
 
   test('connection.destroy() during query execution', async ({ skip }) => {

test/integration/file.test.js

@@ -7,7 +7,7 @@ import * as basePromise from '../../promise.js';
 import * as baseCallback from '../../callback.js';
 import Conf from '../conf.js';
 import { assert, describe, test, beforeAll, afterAll, beforeEach, afterEach } from 'vitest';
-import { createConnection, createPool, createCallbackConnection, createPoolCallback } from '../base.js';
+import { createConnection, createPool, createCallbackConnection, createPoolCallback, isMaxscale } from '../base.js';
 
 describe('sql file import', () => {
   let maxAllowedSize;
@@ -46,7 +46,8 @@ describe('sql file import', () => {
         }
       });
 
-      test('simple file import with direct connection options', async function () {
+      test('simple file import with direct connection options', async ({ skip }) => {
+        if (isMaxscale(shareConn)) return skip();
         await basePromise.importFile(
           Object.assign({}, Conf.baseConfig, { file: __dirname + '/../tools/data-dump.sql', database: 'fimp' })
         );
@@ -212,7 +213,8 @@ describe('sql file import', () => {
         });
       });
 
-      test('simple file import without callback', async () => {
+      test('simple file import without callback', async ({ skip }) => {
+        if (isMaxscale(shareConn)) return skip();
         baseCallback.importFile(
           Object.assign({}, Conf.baseConfig, { file: __dirname + '/../tools/data-dump.sql', database: 'fimp' })
         );
@@ -236,7 +238,8 @@ describe('sql file import', () => {
         });
       }, 30000);
 
-      test('simple file import with direct connection options', async () => {
+      test('simple file import with direct connection options', async ({skip}) => {
+        if (isMaxscale(shareConn)) return skip();
         await new Promise((resolve, reject) => {
           baseCallback.importFile(
             Object.assign({}, Conf.baseConfig, { file: __dirname + '/../tools/data-dump.sql', database: 'fimp' }),

test/integration/pool.test.js

@@ -580,6 +580,7 @@ describe.concurrent('Pool', () => {
 
     await new Promise(function (resolver, rejecter) {
       pool.on('error', (err) => {
+        console.log('error: ' + err);
         assert.isTrue(err.message.includes('Error during pool initialization'));
         assert.isNotNull(err.cause);
         assert.isTrue(

test/integration/redirection.test.js

@@ -7,6 +7,7 @@ import Proxy from '../tools/proxy.js';
 import Conf from '../conf.js';
 import { isMaxscale, isMaxscaleMinVersion, createConnection } from '../base.js';
 import { assert, describe, test, beforeAll, afterAll } from 'vitest';
+import { skip } from 'node:test';
 
 describe.concurrent('redirection', () => {
   let shareConn;
@@ -18,7 +19,8 @@ describe.concurrent('redirection', () => {
     shareConn = null;
   });
 
-  test('basic redirection', async function () {
+  test('basic redirection', async ({ skip }) => {
+    if (isMaxscale(shareConn)) return skip();
     const proxy = new Proxy({
       port: Conf.baseConfig.port,
       host: Conf.baseConfig.host,
@@ -49,43 +51,8 @@ describe.concurrent('redirection', () => {
     }
   });
 
-  test('maxscale redirection', async ({ skip }) => {
-    // need maxscale 23.08+
-    if (!isMaxscale(shareConn) || !isMaxscaleMinVersion(shareConn, 23, 8, 0)) return skip();
-    const proxy = new Proxy({
-      port: Conf.baseConfig.port,
-      host: Conf.baseConfig.host,
-      resetAfterUse: false
-    });
-    await proxy.start();
-
-    try {
-      await shareConn.query(`set @@global.redirect_url="mariadb://${Conf.baseConfig.host}:${Conf.baseConfig.port}"`);
-    } catch (e) {
-      proxy.close();
-      return skip();
-    }
-    let conn = await createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
-    try {
-      assert.equal(Conf.baseConfig.host, conn.info.host);
-      assert.equal(Conf.baseConfig.port, conn.info.port);
-      console.log(await conn.query('Select 1'));
-      await conn.end();
-      console.log('*****************************************************************************');
-      let conn2 = await createConnection({ host: 'localhost', port: proxy.port() });
-      assert.equal(Conf.baseConfig.port, conn2.info.port);
-      console.log(await conn2.query('Select 2'));
-      console.log('*****************************************************************************');
-      await conn2.end();
-    } finally {
-      proxy.close();
-      try {
-        shareConn.query('set @@global.redirect_url=""');
-      } catch (e) {}
-    }
-  });
-
-  test('redirection during pipelining', async function () {
+  test('redirection during pipelining', async ({ skip }) => {
+    if (isMaxscale(shareConn)) return skip();
     const proxy = new Proxy({
       port: Conf.baseConfig.port,
       host: Conf.baseConfig.host,
@@ -114,14 +81,20 @@ describe.concurrent('redirection', () => {
     }
   });
 
-  test('redirection during transaction', async function () {
+  test('redirection during transaction', async ({ skip}) => {
+    if (isMaxscale(shareConn)) return skip();
     const proxy = new Proxy({
       port: Conf.baseConfig.port,
       host: Conf.baseConfig.host,
       resetAfterUse: false
     });
     await proxy.start();
-    let conn = await createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
+    let conn = await createConnection({
+      host: 'localhost',
+      port: proxy.port(),
+      permitRedirect: true,
+      debug: true,
+      debugLen: 1024 });
     try {
       assert.equal(proxy.port(), conn.info.port);
       let permitRedirection = true;