Test node https

.github/workflows/pre-commit.yml

@@ -0,0 +1,52 @@
+---
+name: pre-commit
+on:
+  pull_request:
+  push:
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    env:
+      RAW_LOG: pre-commit.log
+      CS_XML: pre-commit.xml
+    steps:
+      - run: sudo apt-get update && sudo apt-get install cppcheck
+        if: false
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        if: false
+        with:
+          cache: pip
+          python-version: 3.12.1
+      - run: python -m pip install pre-commit
+      - uses: actions/cache/restore@v4
+        with:
+          path: ~/.cache/pre-commit/
+          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit hooks
+        env:
+          SKIP: no-commit-to-branch
+        run: |
+          set -o pipefail
+          pre-commit gc
+          pre-commit run --show-diff-on-failure --color=always --all-files | tee "${RAW_LOG}"
+      - name: Convert Raw Log to Checkstyle format (launch action)
+        uses: mdeweerd/logToCheckStyle@v2024.3.5
+        if: ${{ failure() }}
+        with:
+          in: ${{ env.RAW_LOG }}
+          # out: ${{ env.CS_XML }}
+      - uses: actions/cache/save@v4
+        if: ${{ ! cancelled() }}
+        with:
+          path: ~/.cache/pre-commit/
+          key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Provide log as artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ ! cancelled() }}
+        with:
+          name: precommit-logs
+          path: |
+            ${{ env.RAW_LOG }}
+            ${{ env.CS_XML }}
+          retention-days: 2

.pre-commit-config.yaml

@@ -0,0 +1,26 @@
+---
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.16.3
+    hooks:
+      - id: gitleaks
+  - repo: https://github.com/pre-commit/mirrors-eslint
+    rev: v9.11.1
+    hooks:
+      - id: eslint
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier
+        stages: [commit]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-json
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: https://github.com/rhysd/actionlint
+    rev: v1.7.3
+    hooks:
+      - id: actionlint

README.md

@@ -8,65 +8,115 @@ The missing action for MariaDB :tada:
 
 [![Build Status](https://github.com/ankane/setup-mariadb/actions/workflows/build.yml/badge.svg)](https://github.com/ankane/setup-mariadb/actions)
 
-## Getting Started
+## Options
+
+### No options
 
 Add it as a step to your workflow
 
-```yml
-      - uses: ankane/setup-mariadb@v1
+```yaml
+- uses: ankane/setup-mariadb@v1
 ```
 
-## Versions
+### Specify a version: `mariadb-version`
 
-Specify a version
+The MariaDB version to download (if necessary) and use.
 
-```yml
-      - uses: ankane/setup-mariadb@v1
-        with:
-          mariadb-version: "11.4"
+```yaml
+- uses: ankane/setup-mariadb@v1
+  with:
+    mariadb-version: "11.4"
 ```
 
 Currently supports
 
-Version | `11.4` | `10.11` | `10.6` | `10.5`
---- | --- | --- | --- | ---
-`ubuntu-24.04` | default | ✓ | |
-`ubuntu-22.04` | default | ✓ | ✓ |
-`ubuntu-20.04` | default | ✓ | ✓ | ✓
-`macos-14` | default | ✓ | ✓ | ✓
-`macos-13` | default | ✓ | ✓ | ✓
-`macos-12` | default | ✓ | ✓ | ✓
-`windows-2022` | default | ✓ | ✓ | ✓
-`windows-2019` | default | ✓ | ✓ | ✓
+| Version        | `11.4`  | `10.11` | `10.6` | `10.5` |
+| -------------- | ------- | ------- | ------ | ------ |
+| `ubuntu-24.04` | default | ✓       |        |        |
+| `ubuntu-22.04` | default | ✓       | ✓      |        |
+| `ubuntu-20.04` | default | ✓       | ✓      | ✓      |
+| `macos-14`     | default | ✓       | ✓      | ✓      |
+| `macos-13`     | default | ✓       | ✓      | ✓      |
+| `macos-12`     | default | ✓       | ✓      | ✓      |
+| `windows-2022` | default | ✓       | ✓      | ✓      |
+| `windows-2019` | default | ✓       | ✓      | ✓      |
 
 Test against multiple versions
 
-```yml
-    strategy:
-      matrix:
-        mariadb-version: ["11.4", "10.11", "10.6"]
-    steps:
-      - uses: ankane/setup-mariadb@v1
-        with:
-          mariadb-version: ${{ matrix.mariadb-version }}
+```yaml
+strategy:
+  matrix:
+    mariadb-version: ["11.4", "10.11", "10.6"]
+steps:
+  - uses: ankane/setup-mariadb@v1
+    with:
+      mariadb-version: ${{ matrix.mariadb-version }}
 ```
 
-## Options
+### `database`
+
+The database to create, example
+
+```yaml
+- uses: ankane/setup-mariadb@v1
+  with:
+    database: testdb
+```
+
+### `downloaddir`
+
+Directory to cache MariaDB data. Defaults to `".cache/mariadb"`. The downloaded file will be saved in this directory, allowing you to cache the download using the GitHub `actions/cache` action for instance.
 
-Create a database
+### `mirror`
+
+Server URL to download from. Defaults to `"https://dlm.mariadb.com"`. This replaces the default download server URL.
+
+This helps to be independent of rate-limiting from the original server.
+
+### `download_getopt`
+
+Get options added to the download URL. Defaults to an empty string. By setting `download_getopt` to `"KEY=TOKEN"`, `?KEY=TOKEN` is appended to the download URL, allowing you to block non-authorized downloads from your server.
+
+### Basic usage
+
+```yaml
+steps:
+  - name: Setup MariaDB
+    uses: arkane/setup-mariadb@v1
+    with:
+      mariadb-version: "10.6"
+      database: "my_database"
+```
 
-```yml
-      - uses: ankane/setup-mariadb@v1
-        with:
-          database: testdb
+In this basic example, MariaDB version 10.6 is used, and a database named 'my_database' is created. The other parameters are set to their default values.
+
+### Usage with cache
+
+```yaml
+steps:
+  - name: Cache Files accross workflow sessions
+    uses: actions/cache@v4
+    with:
+      path: .cache/mariadb
+      # Example of a key, use a more appropriate one.
+      key: ${{ runner.os }}-mariadb-${{ hashFiles('**/package-lock.json') }}
+      restore-keys: |
+        ${{ runner.os }}-mariadb-
+
+  - name: Setup MariaDB
+    uses: arkane/setup-mariadb@v1
+    with:
+      mariadb-version: "10.6"
+      database: "my_database"
+      downloaddir: ".cache/mariadb"
 ```
 
 ## Extra Steps
 
 Run queries
 
-```yml
-      - run: mysql -D testdb -e 'SELECT VERSION()'
+```yaml
+- run: mysql -D testdb -e 'SELECT VERSION()'
 ```
 
 ## Related Actions

action.yml

@@ -1,9 +1,22 @@
 name: Setup MariaDB
+description: Setup MariaDB in github workflow
 inputs:
   mariadb-version:
     description: The MariaDB version to download (if necessary) and use
   database:
     description: Database to create
+  downloaddir:
+    description: Directory to cache MariaDB data
+    required: false
+    default: ".cache/mariadb"
+  mirror:
+    description: Server URL to download from (replaces dlm.mariadb.com)
+    required: false
+    default: "https://dlm.mariadb.com"
+  download_getopt:
+    description: Get options added to the download url (to allow limiting downloads from mirror)
+    required: false
+    default: ""
 runs:
   using: node20
   main: index.js

index.js

@@ -1,24 +1,25 @@
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const process = require("process");
+const https = require("https");
 const execSync = require("child_process").execSync;
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const process = require('process');
-const spawnSync = require('child_process').spawnSync;
+const spawnSync = require("child_process").spawnSync;
 
 function run(command) {
   console.log(command);
   let env = Object.assign({}, process.env);
   delete env.CI; // for Homebrew
-  env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = '1';
-  execSync(command, {stdio: 'inherit', env: env});
+  env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = "1";
+  execSync(command, { stdio: "inherit", env: env });
 }
 
 function runSafe() {
   const args = Array.from(arguments);
-  console.log(args.join(' '));
+  console.log(args.join(" "));
   const command = args.shift();
   // spawn is safer and more lightweight than exec
-  const ret = spawnSync(command, args, {stdio: 'inherit'});
+  const ret = spawnSync(command, args, { stdio: "inherit" });
   if (ret.status !== 0) {
     throw ret.error;
   }
@@ -29,83 +30,137 @@ function addToPath(newPath) {
 }
 
 function isMac() {
-  return process.platform == 'darwin';
+  return process.platform == "darwin";
 }
 
 function isWindows() {
-  return process.platform == 'win32';
+  return process.platform == "win32";
 }
 
 function formulaPresent(formula) {
-  const tapPrefix = process.arch == 'arm64' ? '/opt/homebrew' : '/usr/local/Homebrew';
+  const tapPrefix =
+    process.arch == "arm64" ? "/opt/homebrew" : "/usr/local/Homebrew";
   const tap = `${tapPrefix}/Library/Taps/homebrew/homebrew-core`;
-  return fs.existsSync(`${tap}/Formula/${formula[0]}/${formula}.rb`) || fs.existsSync(`${tap}/Aliases/${formula}`);
+  return (
+    fs.existsSync(`${tap}/Formula/${formula[0]}/${formula}.rb`) ||
+    fs.existsSync(`${tap}/Aliases/${formula}`)
+  );
 }
 
 // latest LTS release
-const defaultVersion = '11.4';
-const mariadbVersion = process.env['INPUT_MARIADB-VERSION'] || defaultVersion;
+const defaultVersion = "11.4";
+const mariadbVersion = process.env["INPUT_MARIADB-VERSION"] || defaultVersion;
 
 // only add LTS releases going forward
-if (!['11.4', '11.2', '11.1', '10.11', '10.6', '10.5'].includes(mariadbVersion)) {
-  throw 'Invalid MariaDB version: ' + mariadbVersion;
+if (
+  !["11.4", "11.2", "11.1", "10.11", "10.6", "10.5"].includes(mariadbVersion)
+) {
+  throw "Invalid MariaDB version: " + mariadbVersion;
 }
 
-const database = process.env['INPUT_DATABASE'];
+const database = process.env["INPUT_DATABASE"];
+
+const input_downloaddir = process.env["INPUT_DOWNLOADDIR"];
+const input_mirror = process.env["INPUT_MIRROR"]; // Defaults to https://dlm.mariadb.com
+// Get options added at the end fo the url ("...?<OPTIONS>)
+const input_download_getopt = process.env["INPUT_DOWNLOAD_GETOPT"];
+
+// Final value for mirror
+const mirror = input_mirror;
+
+if (input_download_getopt !== "") {
+  get_opt = `?${input_download_getopt}`;
+} else {
+  get_opt = "";
+}
+
+// Convert downloaddir to a System Path (e.g., '/' to '\\' on windows
+const downloadDirPath = path.parse(input_downloaddir);
+const dirParts = downloadDirPath.dir.split(/[\\/]/);
+downloadDirPath.dir = dirParts.length > 0 ? path.join(...dirParts) : ".";
+const downloaddir = path.format(downloadDirPath);
 
 let bin;
 
 if (isMac()) {
   const formula = `mariadb@${mariadbVersion}`;
   if (!formulaPresent(formula)) {
-    run('brew update');
+    run("brew update");
   }
 
   // install
   run(`brew install ${formula}`);
 
   // start
-  const prefix = process.arch == 'arm64' ? '/opt/homebrew' : '/usr/local';
+  const prefix = process.arch == "arm64" ? "/opt/homebrew" : "/usr/local";
   bin = `${prefix}/opt/${formula}/bin`;
   run(`${bin}/mysql.server start`);
 
   addToPath(bin);
 } else if (isWindows()) {
   // install
-  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mariadb-'));
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "mariadb-"));
   process.chdir(tmpDir);
   const versionMap = {
-    '11.4': '11.4.3',
-    '11.2': '11.2.2',
-    '11.1': '11.1.2',
-    '11.0': '11.0.4',
-    '10.11': '10.11.6',
-    '10.6': '10.6.16',
-    '10.5': '10.5.23'
+    11.4: "11.4.3",
+    11.2: "11.2.2",
+    11.1: "11.1.2",
+    "11.0": "11.0.4",
+    10.11: "10.11.6",
+    10.6: "10.6.16",
+    10.5: "10.5.23",
   };
   const fullVersion = versionMap[mariadbVersion];
-  run(`curl -Ls -o mariadb.msi https://dlm.mariadb.com/MariaDB/mariadb-${fullVersion}/winx64-packages/mariadb-${fullVersion}-winx64.msi`);
-  run(`msiexec /i mariadb.msi SERVICENAME=MariaDB /qn`);
+  const targetPath = path.join(downloaddir, `mariadb-${fullVersion}.msi`);
+
+  // Ensure that '$downloaddir' exists
+  if (!fs.existsSync(downloaddir)) {
+    fs.mkdirSync(downloaddir, { recursive: true });
+  }
+  bin = `${downloaddir}\\mariadb-${fullVersion}.msi`;
+  if (!fs.existsSync(targetPath)) {
+    // run(
+    //   `curl -Ls --user-agent "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:89.0) Gecko/20100101 Firefox/89.0" -o "${targetPath}" ${mirror}/MariaDB/mariadb-${fullVersion}/winx64-packages/mariadb-${fullVersion}-winx64.msi${get_opt}`,
+    // );
+    // Download file via JS
+    const url = `${mirror}/MariaDB/mariadb-${fullVersion}/winx64-packages/mariadb-${fullVersion}-winx64.msi`;
+    const file = fs.createWriteStream(targetPath);
+    https.get(url, function(response) {
+      response.pipe(file);
+    });
+  }
+  // run(`msiexec /i mariadb.msi SERVICENAME=MariaDB /qn`);
+  run(`msiexec /i "${targetPath}" SERVICENAME=MariaDB /qn`);
 
   bin = `C:\\Program Files\\MariaDB ${mariadbVersion}\\bin`;
   addToPath(bin);
 
   // add user
-  run(`"${bin}\\mysql" -u root -e "CREATE USER 'runneradmin'@'localhost' IDENTIFIED BY ''"`);
-  run(`"${bin}\\mysql" -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'runneradmin'@'localhost'"`);
+  run(
+    `"${bin}\\mysql" -u root -e "CREATE USER 'runneradmin'@'localhost' IDENTIFIED BY ''"`,
+  );
+  run(
+    `"${bin}\\mysql" -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'runneradmin'@'localhost'"`,
+  );
   run(`"${bin}\\mysql" -u root -e "FLUSH PRIVILEGES"`);
 } else {
-  const image = process.env['ImageOS'];
-  if (image == 'ubuntu20' || image == 'ubuntu22' || image == 'ubuntu24') {
+  const image = process.env["ImageOS"];
+  if (image == "ubuntu20" || image == "ubuntu22" || image == "ubuntu24") {
     // clear previous data
     run(`sudo systemctl stop mysql.service`);
     run(`sudo rm -rf /var/lib/mysql`);
   }
 
   // install
-  run(`sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8`);
-  run(`echo "deb [arch=amd64,arm64] https://dlm.mariadb.com/repo/mariadb-server/${mariadbVersion}/repo/ubuntu $(. /etc/os-release && echo $VERSION_CODENAME) main" | sudo tee /etc/apt/sources.list.d/mariadb.list`);
-  run(`sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/mariadb.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"`);
+  run(
+    `sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8`,
+  );
+  run(
+    `echo "deb [arch=amd64,arm64] ${mirror}/repo/mariadb-server/${mariadbVersion}/repo/ubuntu $(. /etc/os-release && echo $VERSION_CODENAME) main" | sudo tee /etc/apt/sources.list.d/mariadb.list`,
+  );
+  run(
+    `sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/mariadb.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"`,
+  );
   run(`sudo apt-get install mariadb-server`);
 
   // start
@@ -119,10 +174,9 @@ if (isMac()) {
   run(`sudo mysql -e "GRANT ALL PRIVILEGES ON *.* TO '$USER'@'localhost'"`);
   run(`sudo mysql -e "FLUSH PRIVILEGES"`);
 
-
   bin = `/usr/bin`;
 }
 
 if (database) {
-  runSafe(path.join(bin, 'mysqladmin'), 'create', database);
+  runSafe(path.join(bin, "mysqladmin"), "create", database);
 }

package.json

@@ -0,0 +1,5 @@
+{
+  "name": "setup-mariadb-action",
+  "version": "v1.0",
+  "description": "Setup mariadb-action"
+}