diff --git a/.github/workflows/pr-acquia-tests.yml b/.github/workflows/pr-acquia-tests.yml new file mode 100644 index 0000000..e69de29 diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7b61b..acea0b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## v1.0.1 - [March 4, 2024](https://github.com/lando/acquia/releases/tag/v1.0.1) + +### Fixes + +* Improved `database` selection for purposes of `config` loading, fixes some `database` bootup issues when the `database` type is overriden downstream + ## v1.1.0 - [February 21, 2024](https://github.com/lando/acquia/releases/tag/v1.1.0) * Updated memcached plugin to [v1.1.0](https://github.com/lando/memcached/releases/tag/v1.1.0). diff --git a/builders/acquia-memcached.js b/builders/acquia-memcached.js index 7640b22..2a089ec 100644 --- a/builders/acquia-memcached.js +++ b/builders/acquia-memcached.js @@ -5,7 +5,7 @@ const LandoMemcached = require('@lando/memcached/builders/memcached.js'); // Builder module.exports = { - name: 'laravel-memcached', + name: 'acquia-memcached', parent: '_service', builder: (parent, config) => class LaravelMemcached extends LandoMemcached.builder(parent, LandoMemcached.config) { constructor(id, options = {}) { diff --git a/examples/acquia-downstreamer-1/.lando.yml b/examples/acquia-downstreamer-1/.lando.yml new file mode 100644 index 0000000..5cf7c87 --- /dev/null +++ b/examples/acquia-downstreamer-1/.lando.yml @@ -0,0 +1,11 @@ +name: acquia-downstreamer-1 +recipe: acquia + +services: + database: + type: mysql:8.0 + +# do not remove this +plugins: + "@lando/acquia": ../.. + "@lando/mysql": ../../node_modules/@lando/mysql diff --git a/examples/acquia-downstreamer-1/README.md b/examples/acquia-downstreamer-1/README.md new file mode 100644 index 0000000..18954a9 --- /dev/null +++ b/examples/acquia-downstreamer-1/README.md @@ -0,0 +1,44 @@ +# Acquia Downstreamer 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 using mysql8 +lando mysql -V | grep 8.0 + +# Should use the default database connection info +lando mysql -uacquia -pacquia acquia -e quit + +# Should use the defauly mysql8 config file +lando ssh -s database -c "cat /opt/bitnami/mysql/conf/my_custom.cnf" | grep "LANDOLARAVELMYSQL8CNF" +lando mysql -u root -e "show variables;" | grep innodb_lock_wait_timeout | grep 127 +``` + +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-downstreamer-1/index.php b/examples/acquia-downstreamer-1/index.php new file mode 100644 index 0000000..f39d159 --- /dev/null +++ b/examples/acquia-downstreamer-1/index.php @@ -0,0 +1 @@ +DEFAULTS diff --git a/examples/acquia-downstreamer-1/info.php b/examples/acquia-downstreamer-1/info.php new file mode 100644 index 0000000..147cebc --- /dev/null +++ b/examples/acquia-downstreamer-1/info.php @@ -0,0 +1 @@ + diff --git a/examples/acquia-downstreamer-2/.lando.yml b/examples/acquia-downstreamer-2/.lando.yml new file mode 100644 index 0000000..34bf37d --- /dev/null +++ b/examples/acquia-downstreamer-2/.lando.yml @@ -0,0 +1,11 @@ +name: acquia-downstreamer-2 +recipe: acquia + +services: + database: + type: acquia-mysql:8.0 + +# do not remove this +plugins: + "@lando/acquia": ../.. + "@lando/mysql": ../../node_modules/@lando/mysql diff --git a/examples/acquia-downstreamer-2/README.md b/examples/acquia-downstreamer-2/README.md new file mode 100644 index 0000000..18954a9 --- /dev/null +++ b/examples/acquia-downstreamer-2/README.md @@ -0,0 +1,44 @@ +# Acquia Downstreamer 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 using mysql8 +lando mysql -V | grep 8.0 + +# Should use the default database connection info +lando mysql -uacquia -pacquia acquia -e quit + +# Should use the defauly mysql8 config file +lando ssh -s database -c "cat /opt/bitnami/mysql/conf/my_custom.cnf" | grep "LANDOLARAVELMYSQL8CNF" +lando mysql -u root -e "show variables;" | grep innodb_lock_wait_timeout | grep 127 +``` + +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-downstreamer-2/index.php b/examples/acquia-downstreamer-2/index.php new file mode 100644 index 0000000..f39d159 --- /dev/null +++ b/examples/acquia-downstreamer-2/index.php @@ -0,0 +1 @@ +DEFAULTS diff --git a/examples/acquia-downstreamer-2/info.php b/examples/acquia-downstreamer-2/info.php new file mode 100644 index 0000000..147cebc --- /dev/null +++ b/examples/acquia-downstreamer-2/info.php @@ -0,0 +1 @@ +