Sort container profiles and add visual indicator while coosing the profile.

Author: shahinam

src/Command/Resources/ResourcesCommandBase.php

@@ -81,7 +81,7 @@ protected function filterServices($services, InputInterface $input)
             $byType = [];
             foreach ($services as $name => $service) {
                 $type = $service->type;
-                list($prefix) = explode(':', $service->type, 2);
+                [$prefix] = explode(':', $service->type, 2);
                 $byType[$type][] = $name;
                 $byType[$prefix][] = $name;
             }
@@ -156,4 +156,39 @@ protected function formatCPU($unformatted)
     {
         return sprintf('%.1f', $unformatted);
     }
+
+    /**
+     * Format CPU Type.
+     *
+     * @param array|null $sizeInfo
+     *
+     * @return string
+     */
+    protected function formatCPUType(array|null $sizeInfo): string
+    {
+        $size = $sizeInfo ? $sizeInfo['cpu']  : null;
+        if ($size === null) {
+            return "";
+        }
+
+        return sprintf('(%s)', $sizeInfo['cpu_type']);
+    }
+
+    /**
+     * Sort container profiles by size.
+     *
+     * @param array $profiles
+     *
+     * @return array
+     */
+    protected function sortContainerProfiles(array $profiles): array
+    {
+        foreach ($profiles as &$profile) {
+            uasort($profile, function($a, $b) {
+                return $a['cpu'] <=> (float)$b['cpu'];
+            });
+        }
+
+        return $profiles;
+    }
 }

src/Command/Resources/ResourcesGetCommand.php

@@ -87,7 +87,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $empty = $table->formatIsMachineReadable() ? '' : '<comment>not set</comment>';
         $notApplicable = $table->formatIsMachineReadable() ? '' : 'N/A';
 
-        $containerProfiles = $nextDeployment->container_profiles;
+        $containerProfiles = $this->sortContainerProfiles($nextDeployment->container_profiles);
 
         $rows = [];
         $cpuTypeOption = $input->getOption('cpu-type');

src/Command/Resources/ResourcesSetCommand.php

@@ -135,7 +135,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         /** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */
         $questionHelper = $this->getService('question_helper');
 
-        $containerProfiles = $nextDeployment->container_profiles;
+        $containerProfiles = $this->sortContainerProfiles($nextDeployment->container_profiles);
 
         // Remove guaranteed profiles if project does not support it.
         $supportsGuaranteedCPU = $this->api()->supportsGuaranteedCPU($nextDeployment->project_info);
@@ -203,13 +203,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                       || (isset($properties['resources']['minimum']['memory']) && $sizeInfo['memory'] < $properties['resources']['minimum']['memory'])) {
                         continue;
                     }
-                    $description = sprintf('CPU %s, memory %s MB', $sizeInfo['cpu'], $sizeInfo['memory']);
+                    $description = sprintf('CPU %s, memory %s MB (%s)', $sizeInfo['cpu'], $sizeInfo['memory'], $sizeInfo['cpu_type']);
                     if (isset($properties['resources']['profile_size'])
                         && $profileSize == $properties['resources']['profile_size']) {
                         $description .= ' <question>(current)</question>';
                     } elseif ($defaultOption !== null && $defaultOption === $profileSize) {
                         $description .= ' <question>(default)</question>';
                     }
+
                     $options[$profileSize] = $description;
                 }
 
@@ -410,8 +411,8 @@ private function summarizeChangesPerService($name, $service, array $updates, arr
             $newProperties = array_replace_recursive($properties, $updates);
             $newSizeInfo = $this->sizeInfo($newProperties, $containerProfiles);
             $this->stdErr->writeln('    CPU: ' . $this->formatChange(
-                $this->formatCPU($sizeInfo ? $sizeInfo['cpu'] : null),
-                $this->formatCPU($newSizeInfo['cpu'])
+                $this->formatCPU($sizeInfo ? $sizeInfo['cpu']  : null) . ' ' . $this->formatCPUType($sizeInfo),
+                $this->formatCPU($newSizeInfo['cpu']) . ' '. $this->formatCPUType($newSizeInfo)
             ));
             $this->stdErr->writeln('    Memory: ' . $this->formatChange(
                 $sizeInfo ? $sizeInfo['memory'] : null,

src/Command/Resources/ResourcesSizeListCommand.php

@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $servicesByProfile[$service->container_profile][] = $name;
         }
 
-        $containerProfiles = $nextDeployment->container_profiles;
+        $containerProfiles = $this->sortContainerProfiles($nextDeployment->container_profiles);
 
         if ($serviceOption = $input->getOption('service')) {
             if (!isset($services[$serviceOption])) {