Merge 9d2e216 into d0e3b75

src/Task/YamlConfigurationTask.php

@@ -8,6 +8,8 @@
 use Accompli\EventDispatcher\Event\InstallReleaseEvent;
 use Accompli\EventDispatcher\Event\LogEvent;
 use Accompli\EventDispatcher\EventDispatcherInterface;
+use Accompli\Utility\SecretGenerator;
+use Accompli\Utility\ValueGeneratorInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\Yaml\Yaml;
 
@@ -53,6 +55,13 @@ class YamlConfigurationTask extends AbstractConnectedTask
      */
     private $environmentVariables;
 
+    /**
+     * Generator to generate values.
+     *
+     * @var ValueGeneratorInterface
+     */
+    private $valueGenerator;
+
     /**
      * {@inheritdoc}
      */
@@ -123,6 +132,31 @@ public function onInstallReleaseCreateOrUpdateConfiguration(InstallReleaseEvent
         }
     }
 
+    /**
+     * Sets a value generator.
+     *
+     * @param ValueGeneratorInterface
+     */
+    public function setValueGenerator(ValueGeneratorInterface $valueGenerator)
+    {
+        $this->valueGenerator = $valueGenerator;
+    }
+
+    /**
+     * Gets the value generator
+     * Defaults to SecretGenerator.
+     *
+     * @return ValueGeneratorInterface
+     */
+    private function getValueGenerator()
+    {
+        if (!$this->valueGenerator instanceof ValueGeneratorInterface) {
+            $this->valueGenerator = new SecretGenerator();
+        }
+
+        return $this->valueGenerator;
+    }
+
     /**
      * Gathers environment variables to use in the YAML configuration.
      *
@@ -188,7 +222,7 @@ private function findKeyAndGenerateValue(array &$configuration, array $parameter
 
                     $configuration[$key] = $value;
                 } elseif (is_scalar($value)) {
-                    $configuration[$key] = sha1(uniqid());
+                    $configuration[$key] = $this->getValueGenerator()->generate($key);
                 }
             }
         }

src/Utility/SecretGenerator.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Accompli\Utility;
+
+/**
+ * Generatator to generate secrets.
+ *
+ * @author Ron Rademaker
+ */
+class SecretGenerator implements ValueGeneratorInterface
+{
+    /**
+     * Generated values to prevent different secrets for the same key.
+     *
+     * @var array
+     */
+    private $generatedValues = array();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function generate($key)
+    {
+        if (!array_key_exists($key, $this->generatedValues)) {
+            $this->generatedValues[$key] = sha1(uniqid());
+        }
+
+        return $this->generatedValues[$key];
+    }
+}

src/Utility/ValueGeneratorInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Accompli\Utility;
+
+/**
+ * Interface defining a generator for values.
+ *
+ * @author Ron Rademaker
+ */
+interface ValueGeneratorInterface
+{
+    /**
+     * Generate a value for $key.
+     *
+     * @param string $key
+     *
+     * @return string
+     */
+    public function generate($key);
+}

tests/Task/YamlConfigurationTaskTest.php

@@ -443,4 +443,16 @@ public function provideExpectedStageSpecificConfigurations()
             array('production', "foo: bam\nbaz: ''\nbar:\n    baz: ''\n"),
         );
     }
+
+    /**
+     * Test setting a value generator.
+     */
+    public function testValueGeneratorSetter()
+    {
+        $task = new YamlConfigurationTask('/parameters.yml');
+        $generator = $this->getMockBuilder('Accompli\Utility\ValueGeneratorInterface')->getMock();
+        $task->setValueGenerator($generator);
+
+        $this->assertAttributeEquals($generator, 'valueGenerator', $task);
+    }
 }

tests/Utility/SecretGeneratorTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Accompli\Test\Utility;
+
+use Accompli\Utility\SecretGenerator;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * Unit test for the secret generator.
+ *
+ * @author Ron Rademaker
+ */
+class SecretGeneratorTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests if generated values are not regenerated within the same process.
+     */
+    public function testGeneratedValuesAreNotRegenerated()
+    {
+        $generator = new SecretGenerator();
+
+        $generated = $generator->generate('foobar');
+
+        $this->assertNotEmpty($generated);
+        $this->assertEquals($generated, $generator->generate('foobar'));
+        $this->assertNotEquals($generated, $generator->generate('baz'));
+    }
+}