From 801e1f0017a46b5de9470b8e6bcf8aedab306f69 Mon Sep 17 00:00:00 2001
From: tuutti <tuutti@iki.fi>
Date: Wed, 31 Jan 2024 10:35:47 +0200
Subject: [PATCH 1/2] UHF-9392: Deployment preflight checks

---
 public/sites/default/all.settings.php | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 268137c4e..5789529a2 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -32,3 +32,31 @@
 
 // Sentry DSN for React.
 $config['react_search.settings']['sentry_dsn_react'] = getenv('SENTRY_DSN_REACT');
+
+$additionalEnvVars = [
+  'AZURE_BLOB_STORAGE_SAS_TOKEN|BLOBSTORAGE_SAS_TOKEN',
+  'AZURE_BLOB_STORAGE_NAME',
+  'AZURE_BLOB_STORAGE_CONTAINER',
+  'DRUPAL_VARNISH_HOST',
+  'DRUPAL_VARNISH_PORT',
+  'PROJECT_NAME',
+  'DRUPAL_API_ACCOUNTS',
+  'DRUPAL_VAULT_ACCOUNTS',
+  'REDIS_HOST',
+  'REDIS_PORT',
+  'REDIS_PASSWORD',
+  'TUNNISTAMO_CLIENT_ID',
+  'TUNNISTAMO_CLIENT_SECRET',
+  'TUNNISTAMO_ENVIRONMENT_URL',
+  'SENTRY_DSN',
+  'SENTRY_ENVIRONMENT',
+  // Project specific variables.
+  'ELASTIC_PROXY_URL',
+  'ELASTICSEARCH_URL',
+  'ELASTIC_USER',
+  'ELASTIC_PASSWORD',
+  'SENTRY_DSN_REACT',
+];
+foreach ($additionalEnvVars as $var) {
+  $preflight_checks['environmentVariables'][] = $var;
+}

From 84d40f7f813fd762360b236c9e77e213fa4d6308 Mon Sep 17 00:00:00 2001
From: tuutti <tuutti@iki.fi>
Date: Thu, 1 Feb 2024 09:26:25 +0200
Subject: [PATCH 2/2] UHF-9392: Removed proxy url

---
 public/sites/default/all.settings.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 5789529a2..c5855f1cc 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -9,12 +9,6 @@
   $config['helfi_hotjar.settings']['hjid'] = $hotjar_id;
 }
 
-if ($drush_options_uri = getenv('DRUSH_OPTIONS_URI')) {
-  if (str_contains($drush_options_uri, 'www.hel.fi')) {
-    $config['helfi_proxy.settings']['default_proxy_domain'] = 'www.hel.fi';
-  }
-}
-
 // Elasticsearch settings.
 if (getenv('ELASTICSEARCH_URL')) {
   $config['elasticsearch_connector.cluster.kymp']['url'] = getenv('ELASTICSEARCH_URL');