Merge pull request #5431 from microsoft/qianjin-endgame-june-fix

shenqianjin · web-flow · commit 04a421093844 · 2021-06-24T15:30:11.000+08:00
[Bugfix 1854595] Error on Location ComboBox of MySQL in advanced mode when selected subs are more than one.
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLRegionValidator.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/mysql/MySQLRegionValidator.java
@@ -20,7 +20,7 @@ public class MySQLRegionValidator implements Function<RegionComboBox, AzureValid
     public AzureValidationInfo apply(RegionComboBox comboBox) {
 
         try {
-            if (Azure.az(AzureMySql.class).checkRegionAvailability(comboBox.getValue())) {
+            if (Azure.az(AzureMySql.class).subscription(comboBox.getSubscription().getId()).checkRegionAvailability(comboBox.getValue())) {
                 return AzureValidationInfo.OK;
             }
             final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class MySQLRegionValidator implements Function<RegionComboBox, AzureValid`
`20`	`20`	`public AzureValidationInfo apply(RegionComboBox comboBox) {`
`21`	`21`
`22`	`22`	`try {`
`23`		`- if (Azure.az(AzureMySql.class).checkRegionAvailability(comboBox.getValue())) {`
	`23`	`+ if (Azure.az(AzureMySql.class).subscription(comboBox.getSubscription().getId()).checkRegionAvailability(comboBox.getValue())) {`
`24`	`24`	`return AzureValidationInfo.OK;`
`25`	`25`	`}`
`26`	`26`	`final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();`