Merge pull request #5299 from microsoft/qianjin-s187-bugfix-05

bugfix: fix region issues on sql and mysql.

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/database/RegionComboBox.java

@@ -28,8 +28,8 @@ public class RegionComboBox extends AzureComboBox<Region> {
     @Setter
     private Function<RegionComboBox, AzureValidationInfo> validateFunction;
 
-    private boolean validated;
-    private boolean loaded;
+    private boolean validateRequired;
+    private boolean itemLoaded;
     private AzureValidationInfo validatedInfo;
 
     public void setSubscription(Subscription subscription) {
@@ -55,7 +55,7 @@ protected List<? extends Region> loadItems() {
             return new ArrayList<>();
         }
         List<? extends Region> regions = Azure.az(AzureAccount.class).listRegions(subscription.getId());
-        loaded = true;
+        itemLoaded = true;
         return regions;
     }
 
@@ -71,7 +71,7 @@ protected String getItemText(Object item) {
     public void setSelectedItem(Object value) {
         if (!Objects.equals(value, getSelectedItem())) {
             super.setSelectedItem(value);
-            validated = false;
+            validateRequired = true;
         } else {
             super.setSelectedItem(value);
         }
@@ -85,17 +85,17 @@ public boolean isRequired() {
     @NotNull
     @Override
     public AzureValidationInfo doValidate() {
-        if (Objects.isNull(subscription) || !loaded) {
-            return AzureValidationInfo.OK;
+        if (Objects.isNull(subscription) || !itemLoaded) {
+            return AzureValidationInfo.UNINITIALIZED;
         }
-        if (validated && Objects.nonNull(validatedInfo)) {
-            return validatedInfo;
+        if (!validateRequired) {
+            return Objects.nonNull(validatedInfo) ? validatedInfo : AzureValidationInfo.UNINITIALIZED;
         }
         validatedInfo = super.doValidate();
         if (AzureValidationInfo.OK.equals(validatedInfo)) {
             validatedInfo = validateFunction.apply(this);
         }
-        validated = true;
+        validateRequired = false;
         return validatedInfo;
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/database/ServerNameTextField.java

@@ -36,6 +36,9 @@ public void setSubscriptionId(String subscriptionId) {
     @Override
     @NotNull
     public AzureValidationInfo doValidateValue() {
+        if (StringUtils.isBlank(subscriptionId)) {
+            return AzureValidationInfo.UNINITIALIZED;
+        }
         final AzureValidationInfo info = super.doValidateValue();
         if (!AzureValidationInfo.OK.equals(info)) {
             return info;

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

@@ -6,6 +6,7 @@
 package com.microsoft.azure.toolkit.intellij.mysql;
 
 import com.azure.core.management.exception.ManagementException;
+import com.microsoft.azure.CloudException;
 import com.microsoft.azure.management.mysql.v2020_01_01.implementation.MySQLManager;
 import com.microsoft.azure.management.mysql.v2020_01_01.implementation.PerformanceTierPropertiesInner;
 import com.microsoft.azure.toolkit.intellij.database.RegionComboBox;
@@ -28,7 +29,8 @@ public AzureValidationInfo apply(RegionComboBox comboBox) {
             if (tiers.stream().anyMatch(e -> CollectionUtils.isNotEmpty(e.serviceLevelObjectives()))) {
                 return AzureValidationInfo.OK;
             }
-        } catch (ManagementException e) {
+        } catch (CloudException e) {
+            return AzureValidationInfo.builder().input(comboBox).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();
         }
         final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
         return builder.input(comboBox).message(REGION_UNAVAILABLE_MESSAGE).type(AzureValidationInfo.Type.ERROR).build();

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

@@ -27,6 +27,7 @@ public AzureValidationInfo apply(RegionComboBox comboBox) {
                 return AzureValidationInfo.OK;
             }
         } catch (ManagementException e) {
+            return AzureValidationInfo.builder().input(comboBox).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();
         }
         final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
         return builder.input(comboBox).message(REGION_UNAVAILABLE_MESSAGE).type(AzureValidationInfo.Type.ERROR).build();