From a0d2288ca86cb54072f3a1e1ec4c639e39c0c03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Varela?= Date: Mon, 23 Sep 2024 13:50:26 -0400 Subject: [PATCH 1/2] Fix MySQL 8.0 warning due to empty password. - Specifying MySQL 8 was throwing an error due to password. lando/mysql was updated to handle this, just needed to update deps. - Added a test for it too since this will be the default soon. --- CHANGELOG.md | 1 + examples/acquia-mysql-8/.lando.yml | 9 +++++ examples/acquia-mysql-8/README.md | 40 +++++++++++++++++++ examples/acquia-mysql-8/docroot/env.php | 3 ++ examples/acquia-mysql-8/docroot/index.php | 3 ++ .../docroot/site-environment.php | 3 ++ package-lock.json | 25 +++++++++++- 7 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 examples/acquia-mysql-8/.lando.yml create mode 100644 examples/acquia-mysql-8/README.md create mode 100644 examples/acquia-mysql-8/docroot/env.php create mode 100644 examples/acquia-mysql-8/docroot/index.php create mode 100644 examples/acquia-mysql-8/docroot/site-environment.php diff --git a/CHANGELOG.md b/CHANGELOG.md index b75c3a7..b82fcca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) * Upgrading PHP from 8.2 to 8.3 which is the new default at Acquia. +* Upgrade @lando/mysql for better MySQL 8 support ## v1.3.1 - [September 12, 2024](https://github.com/lando/acquia/releases/tag/v1.3.1) diff --git a/examples/acquia-mysql-8/.lando.yml b/examples/acquia-mysql-8/.lando.yml new file mode 100644 index 0000000..baebca6 --- /dev/null +++ b/examples/acquia-mysql-8/.lando.yml @@ -0,0 +1,9 @@ +name: acquia-mysql-8 +recipe: acquia +services: + database: + type: "mysql:8.0" + +# do not remove this +plugins: + "@lando/acquia": ../.. diff --git a/examples/acquia-mysql-8/README.md b/examples/acquia-mysql-8/README.md new file mode 100644 index 0000000..2e42c1d --- /dev/null +++ b/examples/acquia-mysql-8/README.md @@ -0,0 +1,40 @@ +# Acquia MySQL 8.0 Example + +This example exists primarily to test the following documentation: + +* [Acquia Recipe](https://docs.lando.dev/acquia/config.html) + +Start up tests +-------------- + +Run the following commands to get up and running with this example. + +```bash +# Should start up successfully +lando poweroff +lando start +``` + +Verification commands +--------------------- + +Run the following commands to validate things are rolling as they should. + +```bash +# Should be running mysql 8.0 by default +lando mysql -V | grep 8.0 + +# Should be able to connect to the database with the default creds +lando mysql acquia -e quit +``` + +Destroy tests +------------- + +Run the following commands to trash this app like nothing ever happened. + +```bash +# Should be destroyed with success +lando destroy -y +lando poweroff +``` diff --git a/examples/acquia-mysql-8/docroot/env.php b/examples/acquia-mysql-8/docroot/env.php new file mode 100644 index 0000000..9e87bb8 --- /dev/null +++ b/examples/acquia-mysql-8/docroot/env.php @@ -0,0 +1,3 @@ +
+=18.0.0"
+      }
+    },
+    "node_modules/@lando/mysql/node_modules/@lando/mysql": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@lando/mysql/-/mysql-1.1.0.tgz",
-      "integrity": "sha512-BEd41A0B8eUbTE3dbdnEzY53HykRrH9jjeKSdEvSyczE0mTKSBilA3nrFalaG1CVrjlOl6eamLLPN6vlcEu9Zg==",
       "bundleDependencies": [
         "lodash"
       ],
+      "inBundle": true,
+      "license": "GPL-3.0",
       "dependencies": {
         "lodash": "^4.17.21"
       },
@@ -1578,6 +1594,11 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@lando/mysql/node_modules/@lando/mysql/node_modules/lodash": {
+      "version": "4.17.21",
+      "inBundle": true,
+      "license": "MIT"
+    },
     "node_modules/@lando/mysql/node_modules/lodash": {
       "version": "4.17.21",
       "inBundle": true,

From 5f04ea9d3d4296af2fd7da0b6190dbe4cc6ae50d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Varela?= 
Date: Mon, 23 Sep 2024 15:07:15 -0400
Subject: [PATCH 2/2] Remove extra docroot files

---
 examples/acquia-mysql-8/docroot/env.php              | 3 ---
 examples/acquia-mysql-8/docroot/site-environment.php | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 examples/acquia-mysql-8/docroot/env.php
 delete mode 100644 examples/acquia-mysql-8/docroot/site-environment.php

diff --git a/examples/acquia-mysql-8/docroot/env.php b/examples/acquia-mysql-8/docroot/env.php
deleted file mode 100644
index 9e87bb8..0000000
--- a/examples/acquia-mysql-8/docroot/env.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
-