Issue #3249829: Fix an error: InvalidInstanceType of DescribeInstanceTypes()

modules/cloud_service_providers/aws_cloud/src/Service/Ec2/Ec2Service.php

@@ -4372,7 +4372,9 @@ class Ec2Service extends CloudServiceBase implements Ec2ServiceInterface {
     ];
 
     $types = array_keys($instance_types);
-    $error_count = 0;
+
+    // Temporary keep error messages.
+    $errors = $this->messenger->deleteByType('error');
 
     foreach ($types ?: [] as $idx => $type) {
       $param['InstanceTypes'][] = $type;
@@ -4387,52 +4389,47 @@ class Ec2Service extends CloudServiceBase implements Ec2ServiceInterface {
       // Execute DescribeInstanceTypes.
       $desc_instance_types = $this->describeInstanceTypes($param);
 
-      // Confirm error messages.
-      $messages = $this->messenger->messagesByType('error');
-      if (!empty($messages) && count($messages) > $error_count) {
-        $message = NULL;
-        for ($idx = $error_count; $idx < count($messages); $idx++) {
-          $error_count = $idx;
-
+      // Delete and confirm error messages.
+      $messages = $this->messenger->deleteByType('error');
+      if (!empty($messages)) {
+        $exclude_types = [];
+        foreach ($messages ?: [] as $message) {
           // If the message includes 'InvalidInstanceType',
           // there are some invalid instance types in the parameter.
-          if (strpos($messages[$idx], 'InvalidInstanceType') === FALSE) {
+          if (strpos($message, 'InvalidInstanceType') === FALSE) {
             continue;
           }
 
-          $message = $messages[$idx];
+          $dom = new \DOMDocument();
+          $dom->loadHTML($message);
+          $items = [];
+          foreach ($dom->getElementsByTagName('li') ?: [] as $node) {
+            $items[] = $node->textContent;
+          }
+
+          foreach ($items ?: [] as $item) {
+            if (strpos($item, 'Message:') === FALSE) {
+              continue;
+            }
+
+            $matches = [];
+            if (preg_match('/\[.*?\]/', $item, $matches)) {
+              // Get the invalid instance types.
+              $exclude_types = explode(', ', trim($matches[0], '[]'));
+            }
+          }
           break;
         }
 
-        if (empty($message)) {
+        if (empty($exclude_types)) {
           $param['InstanceTypes'] = [];
           continue;
         }
 
-        $dom = new \DOMDocument();
-        $dom->loadHTML($message);
-        $items = [];
-        foreach ($dom->getElementsByTagName('li') ?: [] as $node) {
-          $items[] = $node->textContent;
-        }
-
-        foreach ($items ?: [] as $item) {
-          if (strpos($item, 'Message:') === FALSE) {
-            continue;
-          }
-
-          $matches = [];
-          if (preg_match('/\[.*?\]/', $item, $matches)) {
-            // Get the invalid instance types.
-            $exclude_types = explode(', ', trim($matches[0], '[]'));
-
-            // Exclude the invalid instance types.
-            // Then execute DescribeInstanceTypes again.
-            $param['InstanceTypes'] = array_diff($param['InstanceTypes'], $exclude_types);
-            $desc_instance_types = $this->describeInstanceTypes($param);
-            break;
-          }
-        }
+        // Exclude the invalid instance types.
+        // Then execute DescribeInstanceTypes again.
+        $param['InstanceTypes'] = array_diff($param['InstanceTypes'], $exclude_types);
+        $desc_instance_types = $this->describeInstanceTypes($param);
       }
 
       if (empty($desc_instance_types['InstanceTypes'])) {
@@ -4456,6 +4453,12 @@ class Ec2Service extends CloudServiceBase implements Ec2ServiceInterface {
 
       $param['InstanceTypes'] = [];
     }
+
+    // Add temporary keeping error messages.
+    foreach ($errors ?: [] as $error) {
+      $this->messenger->addError($error);
+    }
+
   }
 
 }