diff --git a/composer.lock b/composer.lock index 683b38a71..f5e2a3336 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1d3ab16ba09ab7e754afd7b71ae122b5", + "content-hash": "651e43dad6d2c4dc496a5ce9c851467f", "packages": [ { "name": "asm89/stack-cors", @@ -5404,6 +5404,10 @@ "name": "Sascha Eggenberger (saschaeggi)", "homepage": "https://www.drupal.org/u/saschaeggi", "role": "Maintainer" + }, + { + "name": "saschaeggi", + "homepage": "https://www.drupal.org/user/1999056" } ], "description": "Gin Toolbar for Frontend use", @@ -5714,16 +5718,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "f35b0a703e2da09374c4ca137dd6519274db552a" + "reference": "c1ce8909d3ab797bd75e391ed6d80c06b82799c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f35b0a703e2da09374c4ca137dd6519274db552a", - "reference": "f35b0a703e2da09374c4ca137dd6519274db552a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/c1ce8909d3ab797bd75e391ed6d80c06b82799c9", + "reference": "c1ce8909d3ab797bd75e391ed6d80c06b82799c9", "shasum": "" }, "require": { @@ -5740,9 +5744,6 @@ "type": "drupal-module", "extra": { "patches": { - "drupal/core": { - "UHF-10533 D10.3 images": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/f933226cdd9b046d76757d4f885d3d3567365264/patches/UHF-10533-d10-images.patch" - }, "twistor/flysystem-stream-wrapper": { "PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch" }, @@ -5756,10 +5757,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2024-10-11T07:42:06+00:00" + "time": "2024-10-23T12:15:22+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -5767,12 +5768,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "82d8131850bb17d30ac8f72eec0bd5568e4b3640" + "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/82d8131850bb17d30ac8f72eec0bd5568e4b3640", - "reference": "82d8131850bb17d30ac8f72eec0bd5568e4b3640", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/53ad81c4249c6dd38deea3f6014ad0b1be47f2db", + "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db", "shasum": "" }, "require": { @@ -5844,7 +5845,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-10-23T08:02:58+00:00" + "time": "2024-10-23T10:28:01+00:00" }, { "name": "drupal/helfi_formtool_embed", @@ -5950,16 +5951,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.19", + "version": "4.6.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c17835fd4b1629ab55852a857320d6bd102b963d" + "reference": "f5451a53f0e83dcf1fc811c9ced0687f43cd4b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c17835fd4b1629ab55852a857320d6bd102b963d", - "reference": "c17835fd4b1629ab55852a857320d6bd102b963d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f5451a53f0e83dcf1fc811c9ced0687f43cd4b7f", + "reference": "f5451a53f0e83dcf1fc811c9ced0687f43cd4b7f", "shasum": "" }, "require": { @@ -6078,10 +6079,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.19", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.20", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-22T08:56:56+00:00" + "time": "2024-10-24T12:01:48+00:00" }, { "name": "drupal/helfi_proxy", @@ -10072,17 +10073,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.3.0", + "version": "4.3.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.3.0" + "reference": "4.3.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.0.zip", - "reference": "4.3.0", - "shasum": "887e784e3e41b05d6f8915c223d42f4273ada604" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.1.zip", + "reference": "4.3.1", + "shasum": "1089fe41ddb01313f34d55e19e8f3a5157889430" }, "require": { "drupal/core": "^10.3 || ^11" @@ -10099,8 +10100,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.3.0", - "datestamp": "1729513620", + "version": "4.3.1", + "datestamp": "1729683242", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -11967,16 +11968,16 @@ }, { "name": "league/container", - "version": "4.2.2", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88" + "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88", - "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88", + "url": "https://api.github.com/repos/thephpleague/container/zipball/72f9bebe7bd623007782a40f5ec305661ab706d8", + "reference": "72f9bebe7bd623007782a40f5ec305661ab706d8", "shasum": "" }, "require": { @@ -12037,7 +12038,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.2" + "source": "https://github.com/thephpleague/container/tree/4.2.3" }, "funding": [ { @@ -12045,7 +12046,7 @@ "type": "github" } ], - "time": "2024-03-13T13:12:53+00:00" + "time": "2024-10-23T12:06:58+00:00" }, { "name": "league/flysystem", @@ -20604,16 +20605,16 @@ }, { "name": "php-http/discovery", - "version": "1.19.4", + "version": "1.20.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "0700efda8d7526335132360167315fdab3aeb599" + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/0700efda8d7526335132360167315fdab3aeb599", - "reference": "0700efda8d7526335132360167315fdab3aeb599", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", "shasum": "" }, "require": { @@ -20677,9 +20678,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.19.4" + "source": "https://github.com/php-http/discovery/tree/1.20.0" }, - "time": "2024-03-29T13:00:05+00:00" + "time": "2024-10-02T11:20:13+00:00" }, { "name": "php-http/guzzle7-adapter", @@ -20745,16 +20746,16 @@ }, { "name": "php-http/httplug", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", - "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", + "url": "https://api.github.com/repos/php-http/httplug/zipball/5cad731844891a4c282f3f3e1b582c46839d22f4", + "reference": "5cad731844891a4c282f3f3e1b582c46839d22f4", "shasum": "" }, "require": { @@ -20796,9 +20797,9 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.4.0" + "source": "https://github.com/php-http/httplug/tree/2.4.1" }, - "time": "2023-04-14T15:10:03+00:00" + "time": "2024-09-23T11:39:58+00:00" }, { "name": "php-http/promise", diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml index f263c5183..819ef5ee3 100644 --- a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml +++ b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml @@ -8,8 +8,8 @@ id: linkedevents_event label: 'LinkedEvents: Event' label_plural: 'LinkedEvents: Events' description: 'Event entities from https://api.hel.fi/linkedevents.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml index 983d704b2..d2afac639 100644 --- a/conf/cmi/raven.settings.yml +++ b/conf/cmi/raven.settings.yml @@ -4,14 +4,14 @@ client_key: '' environment: '' release: '' log_levels: - 1: 1 - 2: 2 - 3: 3 - 4: 4 - 5: 0 - 6: 0 - 7: 0 - 8: 0 + emergency: true + alert: true + critical: true + error: true + warning: false + notice: false + info: false + debug: false stack: true timeout: 2.0 message_limit: 2048 diff --git a/conf/cmi/user.role.ad_user.yml b/conf/cmi/user.role.ad_user.yml index d1c3ef4d7..89763b05b 100644 --- a/conf/cmi/user.role.ad_user.yml +++ b/conf/cmi/user.role.ad_user.yml @@ -6,6 +6,7 @@ dependencies: - taxonomy.vocabulary.news_tags module: - file + - raven - taxonomy id: ad_user label: 'AD User' @@ -14,3 +15,4 @@ is_admin: null permissions: - 'delete own files' - 'edit terms in news_tags' + - 'send performance traces to sentry' diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml index c3ee3c340..601310a18 100644 --- a/conf/cmi/user.role.admin.yml +++ b/conf/cmi/user.role.admin.yml @@ -56,6 +56,7 @@ dependencies: - path - pathauto - publication_date + - raven - redirect - responsive_image - role_delegation @@ -283,6 +284,7 @@ permissions: - 'revert service revisions' - 'schedule publishing of nodes' - 'select account cancellation method' + - 'send performance traces to sentry' - 'set announcement published on date' - 'set landing_page published on date' - 'set page published on date' diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index ad1676447..60e269301 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -20,6 +20,7 @@ permissions: - 'access content' - 'display eu cookie compliance popup' - 'send javascript errors to sentry' + - 'send performance traces to sentry' - 'view helfi_announcements external entity' - 'view helfi_news external entity' - 'view helfi_news_groups external entity' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 4fb5f2c75..d1d55248c 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -32,6 +32,7 @@ permissions: - 'display eu cookie compliance popup' - 'edit own address content' - 'send javascript errors to sentry' + - 'send performance traces to sentry' - 'use text format full_html' - 'use text format minimal' - 'use text format webform_default' diff --git a/conf/cmi/user.role.content_producer.yml b/conf/cmi/user.role.content_producer.yml index 8f3535124..c674e78fd 100644 --- a/conf/cmi/user.role.content_producer.yml +++ b/conf/cmi/user.role.content_producer.yml @@ -35,6 +35,7 @@ dependencies: - path - pathauto - publication_date + - raven - scheduler - system - taxonomy @@ -125,6 +126,7 @@ permissions: - 'revert page revisions' - 'revert service revisions' - 'schedule publishing of nodes' + - 'send performance traces to sentry' - 'set announcement published on date' - 'set landing_page published on date' - 'set page published on date' diff --git a/conf/cmi/user.role.content_producer_industry.yml b/conf/cmi/user.role.content_producer_industry.yml index 5e7d0b753..09c3a0656 100644 --- a/conf/cmi/user.role.content_producer_industry.yml +++ b/conf/cmi/user.role.content_producer_industry.yml @@ -18,6 +18,7 @@ dependencies: - override_node_options - paragraphs - path + - raven - scheduler - system - taxonomy @@ -51,6 +52,7 @@ permissions: - 'override service published option' - 'revert service revisions' - 'schedule publishing of nodes' + - 'send performance traces to sentry' - 'translate editable entities' - 'translate interface' - 'update media' diff --git a/conf/cmi/user.role.editor.yml b/conf/cmi/user.role.editor.yml index 603f3c5a7..22a63ffb9 100644 --- a/conf/cmi/user.role.editor.yml +++ b/conf/cmi/user.role.editor.yml @@ -32,6 +32,7 @@ dependencies: - paragraphs_library - path - publication_date + - raven - redirect - scheduler - system @@ -132,6 +133,7 @@ permissions: - 'revert news_item revisions' - 'revert page revisions' - 'schedule publishing of nodes' + - 'send performance traces to sentry' - 'set announcement published on date' - 'set landing_page published on date' - 'set news_item published on date' diff --git a/conf/cmi/user.role.grants_admin.yml b/conf/cmi/user.role.grants_admin.yml index 323e4cf69..11293a7ac 100644 --- a/conf/cmi/user.role.grants_admin.yml +++ b/conf/cmi/user.role.grants_admin.yml @@ -44,6 +44,7 @@ dependencies: - path - pathauto - publication_date + - raven - role_delegation - scheduler - system @@ -214,6 +215,7 @@ permissions: - 'revert service revisions' - 'schedule publishing of nodes' - 'select account cancellation method' + - 'send performance traces to sentry' - 'set announcement published on date' - 'set landing_page published on date' - 'set news_item published on date' diff --git a/conf/cmi/user.role.grants_producer.yml b/conf/cmi/user.role.grants_producer.yml index 6353b17c9..9f11962e6 100644 --- a/conf/cmi/user.role.grants_producer.yml +++ b/conf/cmi/user.role.grants_producer.yml @@ -3,15 +3,29 @@ langcode: en status: true dependencies: config: + - media.type.file + - media.type.image + - media.type.remote_video - node.type.landing_page - node.type.page - node.type.service + - taxonomy.vocabulary.avustuslaji + - taxonomy.vocabulary.keywords + - taxonomy.vocabulary.news_tags + - taxonomy.vocabulary.target_group + - taxonomy.vocabulary.ukk_kategoriat + - taxonomy.vocabulary.unit_type module: + - block_content + - content_translation - file - locale - media + - menu_link_content - path + - raven - system + - taxonomy - toolbar - view_unpublished - webform @@ -28,6 +42,7 @@ permissions: - 'delete own files' - 'edit any webform' - 'edit terms in news_tags' + - 'send performance traces to sentry' - 'translate any webform' - 'translate avustuslaji taxonomy_term' - 'translate block_content' diff --git a/conf/cmi/user.role.grants_producer_industry.yml b/conf/cmi/user.role.grants_producer_industry.yml index ad77327c2..bae9d5d19 100644 --- a/conf/cmi/user.role.grants_producer_industry.yml +++ b/conf/cmi/user.role.grants_producer_industry.yml @@ -11,6 +11,7 @@ dependencies: - locale - media - path + - raven - system - toolbar - view_unpublished @@ -26,6 +27,7 @@ permissions: - 'create url aliases' - 'delete own files' - 'edit any webform' + - 'send performance traces to sentry' - 'translate interface' - 'view any unpublished landing_page content' - 'view any unpublished page content' diff --git a/conf/cmi/user.role.helsinkiprofiili.yml b/conf/cmi/user.role.helsinkiprofiili.yml index 315cafb3c..cb6fb1304 100644 --- a/conf/cmi/user.role.helsinkiprofiili.yml +++ b/conf/cmi/user.role.helsinkiprofiili.yml @@ -7,6 +7,7 @@ dependencies: - grants_mandate - grants_oma_asiointi - grants_profile + - raven - webform id: helsinkiprofiili label: HelsinkiProfiili @@ -18,5 +19,6 @@ permissions: - 'delete own files' - 'edit own webform submission' - 'get mandates from dvv' + - 'send performance traces to sentry' - 'view own grants_profile' - 'view own webform submission' diff --git a/conf/cmi/user.role.json_api_user.yml b/conf/cmi/user.role.json_api_user.yml index 9871557ef..7ee500c14 100644 --- a/conf/cmi/user.role.json_api_user.yml +++ b/conf/cmi/user.role.json_api_user.yml @@ -4,6 +4,7 @@ status: true dependencies: module: - file + - raven - webform id: json_api_user label: 'JSON API User' @@ -12,3 +13,4 @@ is_admin: null permissions: - 'access any webform configuration' - 'delete own files' + - 'send performance traces to sentry' diff --git a/conf/cmi/user.role.performance_test_user.yml b/conf/cmi/user.role.performance_test_user.yml index b19cd6f36..bc331adc5 100644 --- a/conf/cmi/user.role.performance_test_user.yml +++ b/conf/cmi/user.role.performance_test_user.yml @@ -4,9 +4,11 @@ status: true dependencies: module: - file + - raven id: performance_test_user label: 'Performance test user' weight: 8 is_admin: null permissions: - 'delete own files' + - 'send performance traces to sentry' diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index dfdf13bb4..bc79e7646 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -11,6 +11,7 @@ dependencies: - helfi_tpr - node - paragraphs + - raven - view_unpublished id: read_only label: 'Vain luku' @@ -18,6 +19,7 @@ weight: -7 is_admin: null permissions: - 'delete own files' + - 'send performance traces to sentry' - 'view any unpublished announcement content' - 'view any unpublished landing_page content' - 'view any unpublished page content' diff --git a/conf/cmi/user.role.survey_editor.yml b/conf/cmi/user.role.survey_editor.yml index 7ba1bc811..87fcad06d 100644 --- a/conf/cmi/user.role.survey_editor.yml +++ b/conf/cmi/user.role.survey_editor.yml @@ -8,6 +8,7 @@ dependencies: - content_translation - node - publication_date + - raven _core: default_config_hash: CliaTgzCQcvNF9ot3u_EbHnydymXh8bvNgNFlSffj9s id: survey_editor @@ -22,6 +23,7 @@ permissions: - 'edit any survey content' - 'edit own survey content' - 'revert survey revisions' + - 'send performance traces to sentry' - 'set survey published on date' - 'translate survey node' - 'view survey revisions' diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index c20c01a4c..7589ed46f 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -1,10 +1,15 @@ #!/bin/bash -#echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" +if [ -z "$DRUPAL_PUBSUB_VAULT" ]; then + echo "PubSub is not configured, exiting." + exit 0 +fi -#while true -#do +echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" + +while true +do # PubSub process exists with success return code after # certain number of messages and should then be restarted. -# drush helfi:azure:pubsub-listen || exit 1 -#done + drush helfi:azure:pubsub-listen || exit 1 +done