Skip to content

Commit

Permalink
Improve database selection.
Browse files Browse the repository at this point in the history
  • Loading branch information
reynoldsalec committed Mar 4, 2024
1 parent 2819d72 commit fb23f27
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 1 deletion.
Empty file.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion builders/acquia-memcached.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}) {
Expand Down
11 changes: 11 additions & 0 deletions examples/acquia-downstreamer-1/.lando.yml
Original file line number Diff line number Diff line change
@@ -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
44 changes: 44 additions & 0 deletions examples/acquia-downstreamer-1/README.md
Original file line number Diff line number Diff line change
@@ -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
```
1 change: 1 addition & 0 deletions examples/acquia-downstreamer-1/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEFAULTS
1 change: 1 addition & 0 deletions examples/acquia-downstreamer-1/info.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?php phpinfo(); ?>
11 changes: 11 additions & 0 deletions examples/acquia-downstreamer-2/.lando.yml
Original file line number Diff line number Diff line change
@@ -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
44 changes: 44 additions & 0 deletions examples/acquia-downstreamer-2/README.md
Original file line number Diff line number Diff line change
@@ -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
```
1 change: 1 addition & 0 deletions examples/acquia-downstreamer-2/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEFAULTS
1 change: 1 addition & 0 deletions examples/acquia-downstreamer-2/info.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?php phpinfo(); ?>

0 comments on commit fb23f27

Please sign in to comment.