Merge pull request #440 from City-of-Helsinki/update-configuration

Automatic update

conf/cmi/core.extension.yml

@@ -6,6 +6,7 @@ module:
   admin_toolbar: 0
   admin_toolbar_tools: 0
   allowed_formats: 0
+  basic_auth: 0
   block: 0
   breakpoint: 0
   ckeditor: 0

conf/cmi/rest.resource.entity.node.yml

@@ -0,0 +1,23 @@
+uuid: 3f4ad863-f17d-4edf-9908-31a1ccdfc159
+langcode: en
+status: true
+dependencies:
+  module:
+    - basic_auth
+    - hal
+    - node
+_core:
+  default_config_hash: t_jfECmZhJqBOJuSOFn87EOi_TWi-_fRYTuJgd19vgg
+id: entity.node
+plugin_id: 'entity:node'
+granularity: resource
+configuration:
+  methods:
+    - GET
+    - POST
+    - PATCH
+    - DELETE
+  formats:
+    - hal_json
+  authentication:
+    - basic_auth

conf/cmi/rest.resource.helfi_debug_data.yml

@@ -3,6 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
+    - basic_auth
+    - helfi_api_base
+    - serialization
     - user
 id: helfi_debug_data
 plugin_id: helfi_debug_data
@@ -14,3 +17,4 @@ configuration:
     - json
   authentication:
     - cookie
+    - basic_auth

conf/cmi/rest.resource.helfi_debug_package_version.yml

@@ -3,6 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
+    - basic_auth
+    - helfi_api_base
+    - serialization
     - user
 id: helfi_debug_package_version
 plugin_id: helfi_debug_package_version
@@ -14,3 +17,4 @@ configuration:
     - json
   authentication:
     - cookie
+    - basic_auth

docker/openshift/entrypoints/20-deploy.sh

@@ -13,20 +13,44 @@ if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
   exit 1
 fi
 
+function get_deploy_id {
+  echo $(drush state:get deploy_id)
+}
+
 # Generate twig caches.
 if [ ! -d "/tmp/twig" ]; then
   drush twig:compile || true
 fi
 
+# Attempt to set deploy ID in case this is the first deploy.
+if [[ -z "$(get_deploy_id)" ]]; then
+  drush state:set deploy_id $OPENSHIFT_BUILD_NAME
+fi
+
+# Exit early if deploy ID is still not set. This usually means either Redis or
+# something else is down.
+if [[ -z "$(get_deploy_id)" ]]; then
+  echo "Could not fetch deploy ID. Something is probably wrong. Exiting early."
+  exit 1
+fi
+
 # This script is run every time a container is spawned and certain environments might
 # start more than one Drupal container. This is used to make sure we run deploy
 # tasks only once per deploy.
-if [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
+if [ "$(get_deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
   drush state:set deploy_id $OPENSHIFT_BUILD_NAME
-  # Put site in maintenance mode during deploy
+  # Put site in maintenance mode
   drush state:set system.maintenance_mode 1 --input-format=integer
+  # Run helfi specific pre-deploy tasks. Allow this to fail in case
+  # the environment is not using the 'helfi_api_base' module.
+  # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+  drush helfi:pre-deploy || true
   # Run maintenance tasks (config import, database updates etc)
   drush deploy
+  # Run helfi specific post deploy tasks. Allow this to fail in case
+  # the environment is not using the 'helfi_api_base' module.
+  # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+  drush helfi:post-deploy || true
   # Disable maintenance mode
   drush state:set system.maintenance_mode 0 --input-format=integer
 fi

public/sites/default/settings.php

@@ -63,19 +63,16 @@
 }
 $routes[] = 'http://127.0.0.1';
 
+if ($drush_options_uri = getenv('DRUSH_OPTIONS_URI')) {
+  $routes[] = $drush_options_uri;
+}
+
 foreach ($routes as $route) {
   $host = parse_url($route, PHP_URL_HOST);
   $trusted_host = str_replace('.', '\.', $host);
   $settings['trusted_host_patterns'][] = '^' . $trusted_host . '$';
 }
 
-$drush_options_uri = getenv('DRUSH_OPTIONS_URI');
-
-if ($drush_options_uri && !in_array($drush_options_uri, $routes)) {
-  $host = str_replace('.', '\.', parse_url($drush_options_uri)['host']);
-  $settings['trusted_host_patterns'][] = '^' . $host . '$';
-}
-
 $settings['config_sync_directory'] = '../conf/cmi';
 $settings['file_public_path'] = getenv('DRUPAL_FILES_PUBLIC') ?: 'sites/default/files';
 $settings['file_private_path'] = getenv('DRUPAL_FILES_PRIVATE');
@@ -171,6 +168,12 @@
   $config['stage_file_proxy.settings']['use_imagecache_root'] = FALSE;
 }
 
+// Map API 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 ($api_accounts = getenv('DRUPAL_API_ACCOUNTS')) {
+  $config['helfi_api_base.api_accounts']['accounts'] = json_decode(base64_decode($api_accounts), TRUE);
+}
+
 // Override session suffix when present.
 if ($session_suffix = getenv('DRUPAL_SESSION_SUFFIX')) {
   $config['helfi_proxy.settings']['session_suffix'] = $session_suffix;