Merge branch 'release/9.x' of github.com:ec-europa/toolkit into relea…

…se/10.x
ec-europa · May 4, 2023 · 0ff0b26 · 0ff0b26
2 parents 99a3246 + c6a7c08
commit 0ff0b26
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Toolkit change log
 
+## Version 9.9.2
+  - DQA-6954: Remove sudo references.
+  - DQA-6889: runner.yml.dist - forcing reverse proxy settings for all repo.
+
 ## Version 9.9.1 | 10.0.0-beta7
   - DQA-6871: GitHooks detect docker-compose VS docker compose.
   - DQA-6930: Toolkit allow to skip abandoned components.

diff --git a/runner.yml.dist b/runner.yml.dist
@@ -15,3 +15,6 @@ toolkit:
         - toolkit:test-phpmd
         - toolkit:lint-php
         - toolkit:test-phpstan
+  test:
+    phpunit:
+      options: 'fail-on-incomplete fail-on-risky fail-on-skipped fail-on-warning'
diff --git a/src/TaskRunner/Commands/BuildCommands.php b/src/TaskRunner/Commands/BuildCommands.php
@@ -332,8 +332,8 @@ public function buildAssets(ConsoleIO $io, array $options = [
                     $collection = $this->collectionBuilder();
                     $collection->taskExecStack()
                         ->dir($theme_dir)
-                        ->exec('sudo apt-get update')
-                        ->exec('sudo apt-get install ruby-sass -y')
+                        ->exec('apt-get update')
+                        ->exec('apt-get install ruby-sass -y')
                         ->stopOnFail();
                 } else {
                     $themeTaskRunner = $options['theme-task-runner'];

diff --git a/src/TaskRunner/Commands/DrupalCommands.php b/src/TaskRunner/Commands/DrupalCommands.php
@@ -555,6 +555,12 @@ protected function getToolkitSettingsBlock()
 \$settings['file_private_path'] =  getenv('DRUPAL_PRIVATE_FILE_SYSTEM') !== FALSE ? getenv('DRUPAL_PRIVATE_FILE_SYSTEM') : 'sites/default/private_files';
 \$settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp';
 
+// Reverse proxy
+if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) {
+  \$settings["reverse_proxy"] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE');
+  \$settings["reverse_proxy_addresses"] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES'));
+}
+
 {$additionalSettings}
 
 // Load environment development override configuration, if available.

diff --git a/tests/fixtures/commands/build.yml b/tests/fixtures/commands/build.yml
@@ -190,8 +190,8 @@
     - contains: |
         [Simulator] Simulating ExecStack()
           ->dir('/test/toolkit/tests/sandbox/BuildCommandsTest/code/theme')
-          ->exec('sudo apt-get update')
-          ->exec('sudo apt-get install ruby-sass -y')
+          ->exec('apt-get update')
+          ->exec('apt-get install ruby-sass -y')
           ->stopOnFail()
         [Simulator] Simulating ExecStack()
           ->exec('cp /test/toolkit/resources/assets/Gruntfile.js /test/t ... /theme/Gruntfile.js')

diff --git a/tests/fixtures/commands/drupal-settings-setup.yml b/tests/fixtures/commands/drupal-settings-setup.yml
@@ -36,6 +36,12 @@
         $settings['file_private_path'] =  getenv('DRUPAL_PRIVATE_FILE_SYSTEM') !== FALSE ? getenv('DRUPAL_PRIVATE_FILE_SYSTEM') : 'sites/default/private_files';
         $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp';
 
+        // Reverse proxy
+        if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) {
+          $settings["reverse_proxy"] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE');
+          $settings["reverse_proxy_addresses"] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES'));
+        }
+
 
 
         // Load environment development override configuration, if available.
@@ -87,6 +93,12 @@
         $settings['file_private_path'] =  getenv('DRUPAL_PRIVATE_FILE_SYSTEM') !== FALSE ? getenv('DRUPAL_PRIVATE_FILE_SYSTEM') : 'sites/default/private_files';
         $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp';
 
+        // Reverse proxy
+        if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) {
+          $settings["reverse_proxy"] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE');
+          $settings["reverse_proxy_addresses"] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES'));
+        }
+
         $config['cas.settings']['server']['hostname'] = getenv('CAS_HOSTNAME');
         $config['cas.settings']['server']['port'] = getenv('CAS_PORT');
 
@@ -139,6 +151,12 @@
         $settings['file_private_path'] =  getenv('DRUPAL_PRIVATE_FILE_SYSTEM') !== FALSE ? getenv('DRUPAL_PRIVATE_FILE_SYSTEM') : 'sites/default/private_files';
         $settings['file_temp_path'] = getenv('DRUPAL_FILE_TEMP_PATH') !== FALSE ? getenv('DRUPAL_FILE_TEMP_PATH') : '/tmp';
 
+        // Reverse proxy
+        if (intval(getenv('DRUPAL_REVERSE_PROXY_ENABLE')) === 1) {
+          $settings["reverse_proxy"] = (bool) getenv('DRUPAL_REVERSE_PROXY_ENABLE');
+          $settings["reverse_proxy_addresses"] = explode(',', getenv('DRUPAL_REVERSE_PROXY_ADDRESSES'));
+        }
+
 
 
         // Load environment development override configuration, if available.