Merge pull request #5298 from microsoft/qianjin-s187-bugfix-04

bugfix: block UI when server name failed to be validated by server side.

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLNameValidator.java

@@ -4,6 +4,7 @@
  */
 package com.microsoft.azure.toolkit.intellij.mysql;
 
+import com.microsoft.azure.CloudException;
 import com.microsoft.azure.toolkit.intellij.database.ServerNameTextField;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azuretools.core.mvp.model.mysql.MySQLMvpModel;
@@ -16,8 +17,12 @@ public class MySQLNameValidator implements Function<ServerNameTextField, AzureVa
     public AzureValidationInfo apply(ServerNameTextField textField) {
         final String value = textField.getValue();
         // validate availability
-        if (!MySQLMvpModel.checkNameAvailabilitys(textField.getSubscriptionId(), value)) {
-            return AzureValidationInfo.builder().input(textField).message(value + " already existed.").type(AzureValidationInfo.Type.ERROR).build();
+        try {
+            if (!MySQLMvpModel.checkNameAvailabilitys(textField.getSubscriptionId(), value)) {
+                return AzureValidationInfo.builder().input(textField).message(value + " already existed.").type(AzureValidationInfo.Type.ERROR).build();
+            }
+        } catch (CloudException e) {
+            return AzureValidationInfo.builder().input(textField).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();
         }
         return AzureValidationInfo.OK;
     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/common/SqlServerNameValidator.java

@@ -4,24 +4,27 @@
  */
 package com.microsoft.azure.toolkit.intellij.sqlserver.common;
 
+import com.azure.core.management.exception.ManagementException;
 import com.microsoft.azure.toolkit.intellij.database.ServerNameTextField;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.common.entity.CheckNameAvailabilityResultEntity;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.AzureSqlServer;
 
 import java.util.function.Function;
-import java.util.regex.Pattern;
 
 public class SqlServerNameValidator implements Function<ServerNameTextField, AzureValidationInfo> {
 
-    private static final Pattern PATTERN = Pattern.compile("^[a-z0-9][a-z0-9-]+[a-z0-9]$");
-
     @Override
     public AzureValidationInfo apply(ServerNameTextField textField) {
         final String value = textField.getValue();
         // validate availability
-        CheckNameAvailabilityResultEntity resultEntity = Azure.az(AzureSqlServer.class).checkNameAvailability(textField.getSubscriptionId(), value);
+        CheckNameAvailabilityResultEntity resultEntity = null;
+        try {
+            resultEntity = Azure.az(AzureSqlServer.class).checkNameAvailability(textField.getSubscriptionId(), value);
+        } catch (ManagementException e) {
+            return AzureValidationInfo.builder().input(textField).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();
+        }
         if (!resultEntity.isAvailable()) {
             String message = resultEntity.getUnavailabilityReason();
             if ("AlreadyExists".equalsIgnoreCase(resultEntity.getUnavailabilityReason())) {