Skip to content

Commit

Permalink
bug #50301 [FrameworkBundle] Ignore vars from dotenv files in secrets…
Browse files Browse the repository at this point in the history
…:list (nicolas-grekas)

This PR was merged into the 6.3 branch.

Discussion
----------

[FrameworkBundle] Ignore vars from dotenv files in secrets:list

| Q             | A
| ------------- | ---
| Branch?       | 6.3
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Sidekick of #48705

Commits
-------

8561045 [FrameworkBundle] Ignore vars from dotenv files in secrets:list
  • Loading branch information
nicolas-grekas committed May 12, 2023
2 parents e3a816d + 8561045 commit eb6a111
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 1 deletion.
Expand Up @@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}

foreach ($localSecrets ?? [] as $name => $value) {
if (isset($rows[$name])) {
if (isset($rows[$name]) && !\in_array($value, ['', false, null], true)) {
$rows[$name][] = $dump($value);
}
}
Expand Down
@@ -0,0 +1,51 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Bundle\FrameworkBundle\Tests\Command;

use PHPUnit\Framework\TestCase;
use Symfony\Bundle\FrameworkBundle\Command\SecretsListCommand;
use Symfony\Bundle\FrameworkBundle\Secrets\AbstractVault;
use Symfony\Component\Console\Tester\CommandTester;

class SecretsListCommandTest extends TestCase
{
public function testExecute()
{
$vault = $this->createMock(AbstractVault::class);
$vault->method('list')->willReturn(['A' => 'a', 'B' => 'b', 'C' => null, 'D' => null, 'E' => null]);
$localVault = $this->createMock(AbstractVault::class);
$localVault->method('list')->willReturn(['A' => '', 'B' => 'A', 'C' => '', 'D' => false, 'E' => null]);
$command = new SecretsListCommand($vault, $localVault);
$tester = new CommandTester($command);
$this->assertSame(0, $tester->execute([]));

$expectedOutput = <<<EOTXT
// Use "%%env(<name>)%%" to reference a secret in a config file.
// To reveal the secrets run %s secrets:list --reveal
-------- -------- -------------
Secret Value Local Value
-------- -------- -------------
A "a"
B "b" "A"
C ******
D ******
E ******
-------- -------- -------------
// Local values override secret values.
// Use secrets:set --local to define them.
EOTXT;
$this->assertStringMatchesFormat($expectedOutput, trim(preg_replace('/ ++$/m', '', $tester->getDisplay(true)), "\n"));
}
}

0 comments on commit eb6a111

Please sign in to comment.