diff --git a/composer.lock b/composer.lock index 7812fa6a..5a652719 100644 --- a/composer.lock +++ b/composer.lock @@ -2650,17 +2650,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.11", + "version": "2.0.12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.11" + "reference": "2.0.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.11.zip", - "reference": "2.0.11", - "shasum": "08e690cdf40d44a6d9386b393f83259a2cf07a21" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.12.zip", + "reference": "2.0.12", + "shasum": "e0e584a2f409709f4547dfe9cc7376a80f8fa317" }, "require": { "drupal/core": "^9 || ^10" @@ -2668,8 +2668,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.11", - "datestamp": "1679952007", + "version": "2.0.12", + "datestamp": "1680556093", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3741,16 +3741,16 @@ }, { "name": "drupal/hdbt", - "version": "5.0.21", + "version": "5.0.25", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "ccc8c1cb500df43c95e1f6b2c7fac42c8f954eea" + "reference": "c9d707ca0abd6f57f83862adff308e21d1ac98d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ccc8c1cb500df43c95e1f6b2c7fac42c8f954eea", - "reference": "ccc8c1cb500df43c95e1f6b2c7fac42c8f954eea", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c9d707ca0abd6f57f83862adff308e21d1ac98d8", + "reference": "c9d707ca0abd6f57f83862adff308e21d1ac98d8", "shasum": "" }, "require": { @@ -3768,29 +3768,31 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.0.21", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.0.25", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-04-19T11:08:29+00:00" + "time": "2023-05-02T06:56:43+00:00" }, { "name": "drupal/hdbt_admin", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "2904d828fe819be9f404f9d2cf8613631897d05b" + "reference": "42422e01afa0ad1fe5e46b9a3c20f411c864f4a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2904d828fe819be9f404f9d2cf8613631897d05b", - "reference": "2904d828fe819be9f404f9d2cf8613631897d05b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/42422e01afa0ad1fe5e46b9a3c20f411c864f4a8", + "reference": "42422e01afa0ad1fe5e46b9a3c20f411c864f4a8", "shasum": "" }, "require": { + "drupal/admin_toolbar": "3.3.0", "drupal/gin": "3.0.0-rc2" }, "conflict": { + "drupal/admin_toolbar": ">3.3.0", "drupal/helfi_platform_config": "<3.0" }, "type": "drupal-theme", @@ -3802,10 +3804,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-04-04T06:26:32+00:00" + "time": "2023-05-02T09:24:52+00:00" }, { "name": "drupal/health_check", @@ -3859,16 +3861,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.4", + "version": "2.4.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "033bd8c3874487d0960c2ee1ba6f276aaf633d69" + "reference": "0673c4633847b50cc9861e61dcdf956062adcd03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/033bd8c3874487d0960c2ee1ba6f276aaf633d69", - "reference": "033bd8c3874487d0960c2ee1ba6f276aaf633d69", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0673c4633847b50cc9861e61dcdf956062adcd03", + "reference": "0673c4633847b50cc9861e61dcdf956062adcd03", "shasum": "" }, "require": { @@ -3892,10 +3894,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-04-20T10:53:37+00:00" + "time": "2023-04-29T15:04:17+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3957,16 +3959,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.4", + "version": "2.0.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385" + "reference": "b6269e6f0aa3ca80bc1f37d8845d89406fb00643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a01a197d7dcef0dcd10935c41955b69c6d216385", - "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/b6269e6f0aa3ca80bc1f37d8845d89406fb00643", + "reference": "b6269e6f0aa3ca80bc1f37d8845d89406fb00643", "shasum": "" }, "require": { @@ -3984,23 +3986,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-04-04T08:26:28+00:00" + "time": "2023-05-02T05:58:43+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.0.28", + "version": "3.0.29", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a57c74f7432934c3a7fd63bdc5b9989259c87a24" + "reference": "1eb8f5b247f9148ec6e0199981be060ac3562ee6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a57c74f7432934c3a7fd63bdc5b9989259c87a24", - "reference": "a57c74f7432934c3a7fd63bdc5b9989259c87a24", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/1eb8f5b247f9148ec6e0199981be060ac3562ee6", + "reference": "1eb8f5b247f9148ec6e0199981be060ac3562ee6", "shasum": "" }, "require": { @@ -4100,10 +4102,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.28", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.29", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-04-20T08:51:20+00:00" + "time": "2023-05-02T05:50:15+00:00" }, { "name": "drupal/helfi_proxy", @@ -6637,16 +6639,16 @@ }, { "name": "elasticsearch/elasticsearch", - "version": "v7.17.1", + "version": "v7.17.2", "source": { "type": "git", "url": "git@github.com:elastic/elasticsearch-php.git", - "reference": "f1b8918f411b837ce5f6325e829a73518fd50367" + "reference": "2d302233f2bb0926812d82823bb820d405e130fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/f1b8918f411b837ce5f6325e829a73518fd50367", - "reference": "f1b8918f411b837ce5f6325e829a73518fd50367", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/2d302233f2bb0926812d82823bb820d405e130fc", + "reference": "2d302233f2bb0926812d82823bb820d405e130fc", "shasum": "" }, "require": { @@ -6659,7 +6661,7 @@ "ext-yaml": "*", "ext-zip": "*", "mockery/mockery": "^1.2", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.4", "symfony/finder": "~4.0" @@ -6696,7 +6698,7 @@ "elasticsearch", "search" ], - "time": "2022-09-30T12:28:55+00:00" + "time": "2023-04-21T15:31:12+00:00" }, { "name": "enlightn/security-checker", @@ -8534,26 +8536,24 @@ }, { "name": "masterminds/html5", - "version": "2.7.6", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "897eb517a343a2281f11bc5556d6548db7d93947" + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", - "reference": "897eb517a343a2281f11bc5556d6548db7d93947", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-dom": "*", - "ext-libxml": "*", "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -8597,9 +8597,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" + "source": "https://github.com/Masterminds/html5-php/tree/2.8.0" }, - "time": "2022-08-18T16:18:26+00:00" + "time": "2023-04-26T07:27:39+00:00" }, { "name": "microsoft/azure-storage-blob", @@ -10087,16 +10087,16 @@ }, { "name": "ruflin/elastica", - "version": "7.3.0", + "version": "7.3.1", "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", - "reference": "75fca5bf2b6792d35dae6c5efeda2322bce914e4" + "reference": "7c61a630c3d456b00a5610960ae3a9bd29987469" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/75fca5bf2b6792d35dae6c5efeda2322bce914e4", - "reference": "75fca5bf2b6792d35dae6c5efeda2322bce914e4", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/7c61a630c3d456b00a5610960ae3a9bd29987469", + "reference": "7c61a630c3d456b00a5610960ae3a9bd29987469", "shasum": "" }, "require": { @@ -10150,9 +10150,9 @@ ], "support": { "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/7.3.0" + "source": "https://github.com/ruflin/Elastica/tree/7.3.1" }, - "time": "2022-11-30T14:21:43+00:00" + "time": "2023-04-21T09:04:46+00:00" }, { "name": "sentry/sdk", @@ -13102,16 +13102,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.22", + "version": "v5.4.23", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4" + "reference": "9a8a5b6d6508928174ded2109e29328a55342a42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", - "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a8a5b6d6508928174ded2109e29328a55342a42", + "reference": "9a8a5b6d6508928174ded2109e29328a55342a42", "shasum": "" }, "require": { @@ -13171,7 +13171,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.22" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.23" }, "funding": [ { @@ -13187,7 +13187,7 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-04-18T09:26:27+00:00" }, { "name": "symfony/yaml", diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 17a25d4b..7b7ede54 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -184,6 +184,12 @@ $config['helfi_api_base.api_accounts']['accounts'] = json_decode(base64_decode($api_accounts), TRUE); } +// Map vault accounts. The value should be a base64 encoded JSON string. +// @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/blob/main/documentation/api-accounts.md. +if ($vault_accounts = getenv('DRUPAL_VAULT_ACCOUNTS')) { + $config['helfi_api_base.api_accounts']['vault'] = json_decode(base64_decode($vault_accounts), TRUE); +} + // Override session suffix when present. if ($session_suffix = getenv('DRUPAL_SESSION_SUFFIX')) { $config['helfi_proxy.settings']['session_suffix'] = $session_suffix; diff --git a/tools/make/utils.mk b/tools/make/utils.mk index c7e5ef60..9ac8b12d 100644 --- a/tools/make/utils.mk +++ b/tools/make/utils.mk @@ -21,7 +21,7 @@ endif PHONY += --open-db-gui --open-db-gui: - @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306)/$(DB_NAME) + @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306 | grep -v ::)/$(DB_NAME) define dbg @printf "${GREEN}${1}:${NO_COLOR} ${2}\n"