fix: fix markers population in generis.conf (#3860)

* fix: fix markers population in generis.conf * codestyle fix * Review changes * fix: notification and review fixes * fix: ci fixes * Update getConfigurationMarkers as non static Co-authored-by: Héctor Arroyo <[email protected]> Signed-off-by: Kiril Hatalski <[email protected]> --------- Signed-off-by: Kiril Hatalski <[email protected]> Co-authored-by: Kirill-Hatalski <[email protected]> Co-authored-by: Héctor Arroyo <[email protected]>
oat-sa · Aug 17, 2023 · ca6d4a3 · ca6d4a3
1 parent 53dda88
commit ca6d4a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/install/class.Setup.php b/install/class.Setup.php
@@ -154,6 +154,10 @@ public function __invoke($params)
         }
 
         $global = $parameters['configuration']['global'];
+
+        $markers = $this->getConfigurationMarkers();
+
+        $global = $markers->replaceMarkers($global);
         $options['module_namespace'] = $global['namespace'];
         $options['instance_name'] = $global['instance_name'];
         $options['module_url'] = $global['url'];
@@ -228,10 +232,6 @@ public function __invoke($params)
         }
 
         //@TODO use $serviceManager->getContainer(ConfigurationMarkers::class) after refactoring taoSetup to use full DI
-        $markers = new ConfigurationMarkers(
-            new SerializableSecretDtoFactory(),
-            $this->getLogger()
-        );
         $parameters = $markers->replaceMarkers($parameters);
 
         foreach ($parameters['configuration'] as $extension => $configs) {
@@ -452,4 +452,12 @@ private function isMasterSlaveConnection(array $defaultPersistenceConfig): bool
                 true
             );
     }
+
+    private function getConfigurationMarkers(): ConfigurationMarkers
+    {
+        return new ConfigurationMarkers(
+            new SerializableSecretDtoFactory(),
+            $this->getLogger()
+        );
+    }
 }
diff --git a/install/init.php b/install/init.php
@@ -38,12 +38,12 @@
 
 require_once($root . 'vendor/autoload.php');
 
+new DotEnvReader();
+
 if (tao_install_utils_System::isTAOInstalled()) {
     require_once($root . 'config/generis.conf.php');
 }
 
-new DotEnvReader();
-
 // Logger service initialization.
 $loggerService = new \oat\oatbox\log\LoggerService();
 $loggerService->addLogger(

diff --git a/install/utils/class.ConfigWriter.php b/install/utils/class.ConfigWriter.php
@@ -24,6 +24,8 @@
  *
  */
 
+use oat\tao\model\configurationMarkers\Secrets\SerializableSecretDto;
+
 /**
  * The ConfigWriter class enables you to create config file from samples
  * and to write the constants inside.
@@ -123,6 +125,10 @@ public function writeConstants(array $constants)
                     $content = preg_replace('/(\'' . $name . '\')(.*?)$/ms', '$1, ' . $val . ');', $content);
                 } elseif (is_numeric($val)) {
                     $content = preg_replace('/(\'' . $name . '\')(.*?)$/ms', '$1, ' . $val . ');', $content);
+                } elseif ($val instanceof SerializableSecretDto) {
+                    // Operating with .env values
+                    $content = preg_replace('/(\'' . $name . '\')(.*?)$/ms', '$1, '
+                        . $val->__toPhpCode() . ');', $content);
                 }
             }
             file_put_contents($this->file, $content);

diff --git a/models/classes/configurationMarkers/ConfigurationMarkers.php b/models/classes/configurationMarkers/ConfigurationMarkers.php
@@ -36,6 +36,7 @@ class ConfigurationMarkers
     private SerializableSecretDtoFactory $serializableFactory;
     private Report $report;
     private array $envVars;
+    private array $matchedVars = [];
 
     public function __construct(
         SerializableSecretDtoFactory $serializableFactory,
@@ -126,6 +127,10 @@ private function findMatches(string $item): array
 
     private function printMatchNotification(bool $isSecretDefined, string $secretName): void
     {
+        if (in_array($secretName, $this->matchedVars)) {
+            return;
+        }
+        array_push($this->matchedVars, $secretName);
         $message = sprintf('Found seed file marker: %s', $secretName);
         if ($isSecretDefined) {
             $message .= ' and its Secrets Storage value.';