invert behavior to provide safer defaults, resolve #27

valantic · Apr 7, 2023 · 64ee315 · 64ee315
1 parent 3f13c49
commit 64ee315
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/src/Command/Cleanup.php b/src/Command/Cleanup.php
@@ -13,7 +13,7 @@
 
 class Cleanup extends BaseCommand
 {
-    protected const OPTION_ONLY_KNOWN = 'only-known';
+    protected const OPTION_ALL_IN_CLUSTER = 'all';
 
     public function __construct(
         protected ElasticsearchClient $esClient,
@@ -25,24 +25,24 @@ public function __construct(
     protected function configure(): void
     {
         $this->setName(self::COMMAND_NAMESPACE . 'cleanup')
-            ->setDescription('Deletes ALL Elasticsearch indices and aliases')
+            ->setDescription('Deletes Elasticsearch indices and aliases known to (i.e. created by) the bundle')
             ->addOption(
-                self::OPTION_ONLY_KNOWN,
-                'k',
+                self::OPTION_ALL_IN_CLUSTER,
+                'a',
                 InputOption::VALUE_NONE,
-                'Delete only indices known to (i.e. created by) the bundle'
+                'Delete all indices in cluster including indices not created by this bundle but e.g. by Pimcore Enterprise features'
             );
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->output->writeln(
-            $this->input->getOption(self::OPTION_ONLY_KNOWN) === true
-                ? 'Only deleting KNOWN indices'
-                : 'Deleting ALL indices in the cluster'
+            $this->input->getOption(self::OPTION_ALL_IN_CLUSTER) === true
+                ? 'Deleting ALL indices in the cluster'
+                : 'Only deleting KNOWN indices'
         );
         $helper = $this->getHelper('question');
-        $question = new ConfirmationQuestion('Are you sure you want to delete all indices and aliases? (y/n)', false);
+        $question = new ConfirmationQuestion('Are you sure you want to proceed deleting indices and aliases? (y/N)', false);
 
         if (!$helper->ask($input, $output, $question)) {
             return self::FAILURE;
@@ -68,22 +68,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      */
     private function getIndices(): array
     {
-        if ($this->input->getOption(self::OPTION_ONLY_KNOWN) === true) {
-            $indices = [];
+        if ($this->input->getOption(self::OPTION_ALL_IN_CLUSTER) === true) {
+            return $this->esClient->getCluster()->getIndexNames();
+        }
 
-            foreach ($this->indexRepository->flattened() as $indexConfig) {
-                if ($indexConfig->usesBlueGreenIndices()) {
-                    $indices[] = $indexConfig->getBlueGreenActiveElasticaIndex()->getName();
-                    $indices[] = $indexConfig->getBlueGreenInactiveElasticaIndex()->getName();
-                    continue;
-                }
+        $indices = [];
 
-                $indices[] = $indexConfig->getName();
+        foreach ($this->indexRepository->flattened() as $indexConfig) {
+            if ($indexConfig->usesBlueGreenIndices()) {
+                $indices[] = $indexConfig->getBlueGreenActiveElasticaIndex()->getName();
+                $indices[] = $indexConfig->getBlueGreenInactiveElasticaIndex()->getName();
+                continue;
             }
 
-            return $indices;
+            $indices[] = $indexConfig->getName();
         }
 
-        return $this->esClient->getCluster()->getIndexNames();
+        return $indices;
     }
 }