Deprecate db:size and mount:size commands

Author: pjcdawkins

src/Command/CommandBase.php

@@ -45,6 +45,7 @@ abstract class CommandBase extends Command implements MultiAwareInterface
 
     const STABILITY_STABLE = 'STABLE';
     const STABILITY_BETA = 'BETA';
+    const STABILITY_DEPRECATED = 'DEPRECATED';
 
     const DEFAULT_ENVIRONMENT_CODE = '.';
 
@@ -565,7 +566,7 @@ protected function checkMigrateToNewCLI()
             return;
         }
 
-        $message = "<comment>Warning:</comment>"
+        $message = "<options=bold;fg=yellow>Warning:</>"
             . "\nRunning the CLI directly under PHP is now referred to as the \"Legacy CLI\", and is no longer recommended.";
         if ($config->has('migrate.docs_url')) {
             $message .= "\nInstall the latest release for your operating system by following these instructions: "
@@ -2062,7 +2063,8 @@ public function getDescription() {
         $description = parent::getDescription();
 
         if ($this->stability !== self::STABILITY_STABLE) {
-            $prefix = '<fg=white;bg=red> ' . strtoupper($this->stability) . ' </> ';
+            $tag = $this->stability === self::STABILITY_DEPRECATED ? '<fg=black;bg=yellow>' : '<fg=white;bg=red>';
+            $prefix = $tag . strtoupper($this->stability) . '</> ';
             $description = $prefix . $description;
         }
 

src/Command/Db/DbSizeCommand.php

@@ -36,7 +36,11 @@ protected function configure() {
             ->addOption('cleanup', 'C', InputOption::VALUE_NONE, 'Check if tables can be cleaned up and show me recommendations (InnoDb only).');
         $help = self::ESTIMATE_WARNING;
         if ($this->config()->getWithDefault('api.metrics', false)) {
-            $help .= "\n\n" . \sprintf('To see more accurate disk usage, run: <info>%s disk</info>', $this->config()->get('application.executable'));
+            $this->stability = self::STABILITY_DEPRECATED;
+            $help .= "\n\n";
+            $help .= '<options=bold;fg=yellow>Deprecated:</>';
+            $help .= "\nThis command is deprecated and will be removed in a future version.\n";
+            $help .= \sprintf('To see more accurate disk usage, run: <comment>%s disk</comment>', $this->config()->get('application.executable'));
         }
         $this->setHelp($help);
         $this->addProjectOption()->addEnvironmentOption()->addAppOption();
@@ -211,21 +215,19 @@ private function showInaccessibleSchemas(Service $service, array $database) {
     private function showWarnings($percentageUsed) {
         if ($percentageUsed > self::RED_WARNING_THRESHOLD) {
             $this->stdErr->writeln('');
-            $this->stdErr->writeln('<options=bold;fg=red>Warning</>');
+            $this->stdErr->writeln('<options=bold;fg=red>Warning:</>');
             $this->stdErr->writeln('Databases tend to need extra space for starting up and temporary storage when running large queries.');
             $this->stdErr->writeln(sprintf('Please increase the allocated space in %s', $this->config()->get('service.project_config_dir') . '/services.yaml'));
         }
 
-        if ($this->config()->getWithDefault('api.metrics', false)
-            && ($data = $this->getSelectedEnvironment()->getData())
-            && isset($data['_links']['#metrics'])) {
-            $this->stdErr->writeln('');
-            $this->stdErr->writeln('<options=bold;fg=yellow>Notice</>');
-            $this->stdErr->writeln('This environment supports the Metrics API');
-            $this->stdErr->writeln(\sprintf('You can see disk usage much more accurately by running: <info>%s disk</info>', $this->config()->get('application.executable')));
+        $this->stdErr->writeln('');
+
+        if ($this->config()->getWithDefault('api.metrics', false) && $this->config()->isCommandEnabled('metrics:disk')) {
+            $this->stdErr->writeln('<options=bold;fg=yellow>Deprecated:</>');
+            $this->stdErr->writeln('This command is deprecated and will be removed in a future version.');
+            $this->stdErr->writeln(\sprintf('To see more accurate disk usage, run: <comment>%s disk</comment>', $this->config()->get('application.executable')));
         } else {
-            $this->stdErr->writeln('');
-            $this->stdErr->writeln('<options=bold;fg=yellow>Warning</>');
+            $this->stdErr->writeln('<options=bold;fg=yellow>Warning:</>');
             $this->stdErr->writeln(self::ESTIMATE_WARNING);
         }
     }

src/Command/Domain/DomainDeleteCommand.php

@@ -64,7 +64,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             })) > 0;
             if ($hasNonProductionActiveEnvs) {
                 $this->stdErr->writeln([
-                    '<options=bold>Warning</>',
+                    '<options=bold>Warning:</>',
                     'If this domain has non-production domains attached to it, they will also be deleted.',
                     'Non-production environments will not be automatically redeployed.',
                     'Consider redeploying these environments so that routes are updated correctly.',

src/Command/Mount/MountSizeCommand.php

@@ -38,15 +38,21 @@ protected function configure()
         $this->addProjectOption();
         $this->addEnvironmentOption();
         $this->addRemoteContainerOptions();
-        $this->setHelp(<<<EOF
+        $help = <<<EOF
 Use this command to check the disk size and usage for an application's mounts.
 
 Mounts are directories mounted into the application from a persistent, writable
 filesystem. They are configured in the <info>mounts</info> key in the application configuration.
 
 The filesystem's total size is determined by the <info>disk</info> key in the same file.
-EOF
-);
+EOF;
+        if ($this->config()->getWithDefault('api.metrics', false)) {
+            $this->stability = self::STABILITY_DEPRECATED;
+            $help .= "\n\n";
+            $help .= '<options=bold;fg=yellow>Deprecated:</>';
+            $help .= sprintf("\nThis command is deprecated and will be removed in a future version.\nTo see disk metrics, run: <comment>%s disk</comment>", $this->config()->get('application.executable'));
+        }
+        $this->setHelp($help);
     }
 
     /**
@@ -159,6 +165,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->stdErr->writeln(
                 'To increase the available space, edit the <info>disk</info> key in the application configuration.'
             );
+
+            if ($this->config()->getWithDefault('api.metrics', false) && $this->config()->isCommandEnabled('metrics:disk')) {
+                $this->stdErr->writeln('');
+                $this->stdErr->writeln('<options=bold;fg=yellow>Deprecated:</>');
+                $this->stdErr->writeln('This command is deprecated and will be removed in a future version.');
+                $this->stdErr->writeln(sprintf('To see disk metrics, run: <comment>%s disk</comment>', $this->config()->get('application.executable')));
+            }
         }
 
         return 0;

src/Service/CurlCli.php

@@ -106,7 +106,7 @@ public function run($baseUrl, InputInterface $input, OutputInterface $output) {
         $stdErr->writeln(sprintf('Running command: <info>%s</info>', str_replace($token, '[token]', $commandline)), OutputInterface::VERBOSITY_VERBOSE);
 
         if ($output->isVeryVerbose()) {
-            $stdErr->writeln("\n<fg=yellow;options=bold>Warning</>\nVerbose mode is enabled. Do not copy and paste the output as it may contain sensitive headers.\n");
+            $stdErr->writeln("\n<fg=yellow;options=bold>Warning:</>\nVerbose mode is enabled. Do not copy and paste the output as it may contain sensitive headers.\n");
         }
 
         $process = proc_open($commandline, [STDIN, STDOUT, STDERR], $pipes);