From 9de9089a1b023378911d4c36aca21a43beb03f1b Mon Sep 17 00:00:00 2001
From: actions-bot <actions-bot@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:51:19 +0000
Subject: [PATCH] Update configuration

---
 composer.lock                           | 93 ++++++++++++-------------
 conf/cmi/filter.format.full_html.yml    |  4 +-
 conf/cmi/filter.format.minimal.yml      |  4 +-
 docker/openshift/crons/pubsub.sh        | 15 ++++
 public/sites/default/azure.settings.php | 11 +++
 public/sites/default/settings.php       | 10 +++
 tools/make/docker.mk                    |  2 +-
 tools/make/symfony.mk                   |  2 +-
 8 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100644 docker/openshift/crons/pubsub.sh

diff --git a/composer.lock b/composer.lock
index 167650de8..5f318439c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2819,10 +2819,6 @@
                 {
                     "name": "tatarbj",
                     "homepage": "https://www.drupal.org/user/649590"
-                },
-                {
-                    "name": "volkswagenchick",
-                    "homepage": "https://www.drupal.org/user/3332522"
                 }
             ],
             "description": "Adds configuration to the system breadcrumbs.",
@@ -3931,16 +3927,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "5.5.15",
+            "version": "5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "028a595100e90e68c02dfa07bef5da110260d2d3"
+                "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/028a595100e90e68c02dfa07bef5da110260d2d3",
-                "reference": "028a595100e90e68c02dfa07bef5da110260d2d3",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09",
+                "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09",
                 "shasum": ""
             },
             "require": {
@@ -3958,10 +3954,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.15",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2023-09-06T04:30:25+00:00"
+            "time": "2023-09-11T12:42:43+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4050,16 +4046,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.5.1",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "2224db4ce144dc84672229271952dabb33c377f5"
+                "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2224db4ce144dc84672229271952dabb33c377f5",
-                "reference": "2224db4ce144dc84672229271952dabb33c377f5",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/10f5700e4c38c403d2cc54d2733cadaff72d67c1",
+                "reference": "10f5700e4c38c403d2cc54d2733cadaff72d67c1",
                 "shasum": ""
             },
             "require": {
@@ -4085,10 +4081,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.1",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.2",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2023-09-06T05:15:45+00:00"
+            "time": "2023-09-08T09:03:20+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4135,12 +4131,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-tools.git",
-                "reference": "a7868ae97fee754fd8110a991c364decbb492f1a"
+                "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/a7868ae97fee754fd8110a991c364decbb492f1a",
-                "reference": "a7868ae97fee754fd8110a991c364decbb492f1a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa",
+                "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa",
                 "shasum": ""
             },
             "default-branch": true,
@@ -4153,7 +4149,7 @@
                 "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
                 "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
             },
-            "time": "2023-08-30T11:41:00+00:00"
+            "time": "2023-09-06T06:27:11+00:00"
         },
         {
             "name": "drupal/helfi_navigation",
@@ -4191,16 +4187,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "3.3.9",
+            "version": "3.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a"
+                "reference": "5a897b2831edf5c99ea85aee55becfaaca859cc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/44bd43974a82eab9c9c95cf2727b383b6da2d82a",
-                "reference": "44bd43974a82eab9c9c95cf2727b383b6da2d82a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5a897b2831edf5c99ea85aee55becfaaca859cc3",
+                "reference": "5a897b2831edf5c99ea85aee55becfaaca859cc3",
                 "shasum": ""
             },
             "require": {
@@ -4293,9 +4289,6 @@
                     "drupal/social_media": {
                         "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch"
                     },
-                    "drupal/translatable_menu_link_uri": {
-                        "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch"
-                    },
                     "drupal/simple_sitemap": {
                         "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch"
                     }
@@ -4306,10 +4299,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.9",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.3",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2023-09-01T08:09:08+00:00"
+            "time": "2023-09-11T12:42:54+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -5711,17 +5704,17 @@
         },
         {
             "name": "drupal/paragraphs",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/paragraphs.git",
-                "reference": "8.x-1.15"
+                "reference": "8.x-1.16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.15.zip",
-                "reference": "8.x-1.15",
-                "shasum": "2ed2d3199553010fa1c500181bbebe676e9e60c1"
+                "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.16.zip",
+                "reference": "8.x-1.16",
+                "shasum": "48f60810fd8086a52d56e84af8b212cce7a270e8"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10",
@@ -5745,8 +5738,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.15",
-                    "datestamp": "1661440897",
+                    "version": "8.x-1.16",
+                    "datestamp": "1694007797",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -7152,26 +7145,26 @@
         },
         {
             "name": "drupal/translatable_menu_link_uri",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/translatable_menu_link_uri.git",
-                "reference": "2.0.0"
+                "reference": "2.1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.0.0.zip",
-                "reference": "2.0.0",
-                "shasum": "6960a485565d886cf35ee6dd56310de47e04e430"
+                "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.1.0.zip",
+                "reference": "2.1.0",
+                "shasum": "3bafa0a19761524560a2d232c945f10643e91053"
             },
             "require": {
-                "drupal/core": "^8 || ^9"
+                "drupal/core": "^8 || ^9 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0",
-                    "datestamp": "1597491393",
+                    "version": "2.1.0",
+                    "datestamp": "1694361965",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -16979,16 +16972,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.23.1",
+            "version": "1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26"
+                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26",
-                "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6",
+                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6",
                 "shasum": ""
             },
             "require": {
@@ -17020,9 +17013,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0"
             },
-            "time": "2023-08-03T16:32:59+00:00"
+            "time": "2023-09-07T20:46:32+00:00"
         },
         {
             "name": "phpstan/phpstan",
diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index 8bfe23857..7b1b39966 100644
--- a/conf/cmi/filter.format.full_html.yml
+++ b/conf/cmi/filter.format.full_html.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_api_base
     - linkit
 _core:
-  default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4
+  default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c
 name: HTML
 format: full_html
 weight: 0
@@ -24,7 +24,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote aria-* class=""> <ul> <ol start> <li> <h2> <h3> <h4> <h5> <h6> <p class=""> <footer class=""> <br> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th colspan rowspan> <td colspan rowspan> <tr> <hr> <span role aria-* lang dir class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
index 1b0b1f057..9be8e8feb 100644
--- a/conf/cmi/filter.format.minimal.yml
+++ b/conf/cmi/filter.format.minimal.yml
@@ -7,7 +7,7 @@ dependencies:
     - helfi_api_base
     - linkit
 _core:
-  default_config_hash: iir5dZUojC1bWTysG1mu4qEgxkT8Le4FLCF6C1hQSoY
+  default_config_hash: 6AGo1h4zFCH6SC4pUy99nHKNsUsd7ZNLffnFw9RiSBA
 name: Minimal
 format: minimal
 weight: 0
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
+      allowed_html: '<em> <strong> <ul> <ol start> <li> <p class=""> <a href hreflang !href rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <span role aria-* lang dir class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh
new file mode 100644
index 000000000..d5d0fc16f
--- /dev/null
+++ b/docker/openshift/crons/pubsub.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
+
+i=0
+# Attempt to start this service five times.
+until [ $i -gt 5 ]
+do
+  drush helfi:azure:pubsub-listen
+
+  if [[ "$?" -ne 0 ]]; then
+    ((i=i+1))
+    sleep 10
+  fi
+done
diff --git a/public/sites/default/azure.settings.php b/public/sites/default/azure.settings.php
index bfc1a1ebf..a5cdc866f 100644
--- a/public/sites/default/azure.settings.php
+++ b/public/sites/default/azure.settings.php
@@ -22,3 +22,14 @@
 $config['system.performance']['stale_file_threshold'] = 7776000;
 
 $settings['is_azure'] = TRUE;
+
+/**
+ * Deployment identifier.
+ *
+ * Use OpenShift build name (like 'drupal-1234') to determine
+ * if container needs to be invalidated and rebuilt.
+ *
+ * This should fix the issue where deployment fails due to changed service
+ * parameters.
+ */
+$settings['deployment_identifier'] = getenv('OPENSHIFT_BUILD_NAME');
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
index 91ae77dd6..fb6e98393 100644
--- a/public/sites/default/settings.php
+++ b/public/sites/default/settings.php
@@ -276,3 +276,13 @@
     include_once __DIR__ . '/azure.settings.php'; // NOSONAR
   }
 }
+
+/**
+ * Deployment identifier.
+ *
+ * Default 'deployment_identifier' cache key to modified time of 'composer.lock'
+ * file in case it's not already defined.
+ */
+if (empty($settings['deployment_identifier'])) {
+  $settings['deployment_identifier'] = filemtime(__DIR__ . '/../../../composer.lock');
+}
diff --git a/tools/make/docker.mk b/tools/make/docker.mk
index 0aa080069..d7271e80f 100644
--- a/tools/make/docker.mk
+++ b/tools/make/docker.mk
@@ -38,7 +38,7 @@ stop: ## Stop the environment
 PHONY += up
 up: ## Launch the environment
 	$(call step,Start up the container(s)...\n)
-	$(call docker_compose,up -d --remove-orphans)
+	$(call docker_compose,up --wait --remove-orphans)
 
 PHONY += shell
 shell: ## Login to CLI container
diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk
index 069c6a789..736720756 100644
--- a/tools/make/symfony.mk
+++ b/tools/make/symfony.mk
@@ -55,7 +55,7 @@ fix-symfony: ## Fix Symfony code style
 PHONY += lint-symfony
 lint-symfony: ## Lint Symfony code style
 	$(call step,Lint Symfony code style...\n)
-	$(call cs_symfony,fix --dry-run --diff --ansi src)
+	$(call cs_symfony,fix --dry-run --diff --ansi --verbose src)
 
 ifeq ($(RUN_ON),docker)
 define sf_console