Add strict mode option for secrets:decrypt-to-local command

dciprian-petrisor · dciprian-petrisor · commit 8f643fbb687d · 2024-07-06T22:19:33.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Derivate `kernel.secret` from the decryption secret when its env var is not defined
  * Make the `config/` directory optional in `MicroKernelTrait`, add support for service arguments in the
    invokable Kernel class, and register `FrameworkBundle` by default when the `bundles.php` file is missing
+ * Add strict mode option for `secrets:decrypt-to-local` command
 
 7.1
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php
@@ -38,6 +38,7 @@ public function __construct(
     protected function configure(): void
     {
         $this
+            ->addOption('strict', 's', InputOption::VALUE_NONE, 'Returns a non-zero exit code if any errors are encountered')
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force overriding of secrets that already exist in the local vault')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command decrypts all secrets and copies them in the local vault.
@@ -47,6 +48,10 @@ protected function configure(): void
 When the option <info>--force</info> is provided, secrets that already exist in the local vault are overriden.
 
     <info>%command.full_name% --force</info>
+
+When the option <info>--strict</info> is provided, the command will return a non-zero exit code if any errors are encountered.
+
+    <info>%command.full_name% --strict</info>
 EOF
             )
         ;
@@ -83,16 +88,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ]);
         }
 
+        $hadErrors = false;
         foreach ($secrets as $k => $v) {
             if (null === $v) {
                 $io->error($this->vault->getLastMessage() ?? \sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));
+                $hadErrors = true;
                 continue;
             }
 
             $this->localVault->seal($k, $v);
             $io->note($this->localVault->getLastMessage());
         }
 
+        if ($hadErrors && $input->getOption('strict'))  {
+            return 1;
+        }
+
         return 0;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public function __construct(`
`38`	`38`	`protected function configure(): void`
`39`	`39`	`{`
`40`	`40`	`$this`
	`41`	`+ ->addOption('strict', 's', InputOption::VALUE_NONE, 'Returns a non-zero exit code if any errors are encountered')`
`41`	`42`	`->addOption('force', 'f', InputOption::VALUE_NONE, 'Force overriding of secrets that already exist in the local vault')`
`42`	`43`	`->setHelp(<<<'EOF'`
`43`	`44`	`The <info>%command.name%</info> command decrypts all secrets and copies them in the local vault.`
`@@ -47,6 +48,10 @@ protected function configure(): void`
`47`	`48`	`When the option <info>--force</info> is provided, secrets that already exist in the local vault are overriden.`
`48`	`49`
`49`	`50`	`<info>%command.full_name% --force</info>`
	`51`	`+`
	`52`	`+When the option <info>--strict</info> is provided, the command will return a non-zero exit code if any errors are encountered.`
	`53`	`+`
	`54`	`+ <info>%command.full_name% --strict</info>`
`50`	`55`	`EOF`
`51`	`56`	`)`
`52`	`57`	`;`
`@@ -83,16 +88,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`83`	`88`	`]);`
`84`	`89`	`}`
`85`	`90`
	`91`	`+ $hadErrors = false;`
`86`	`92`	`foreach ($secrets as $k => $v) {`
`87`	`93`	`if (null === $v) {`
`88`	`94`	`$io->error($this->vault->getLastMessage() ?? \sprintf('Secret "%s" has been skipped as there was an error reading it.', $k));`
	`95`	`+ $hadErrors = true;`
`89`	`96`	`continue;`
`90`	`97`	`}`
`91`	`98`
`92`	`99`	`$this->localVault->seal($k, $v);`
`93`	`100`	`$io->note($this->localVault->getLastMessage());`
`94`	`101`	`}`
`95`	`102`
	`103`	`+ if ($hadErrors && $input->getOption('strict')) {`
	`104`	`+ return 1;`
	`105`	`+ }`
	`106`	`+`
`96`	`107`	`return 0;`
`97`	`108`	`}`
`98`	`109`	`}`