Merge pull request #6865 from microsoft/cosmos/fixes

Fix issues related with cosmos db account in feature test

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/IntelliJCosmosActionsContributor.java

@@ -42,8 +42,9 @@
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 
-import static com.microsoft.azure.toolkit.intellij.cosmos.creation.CreateCosmosDBAccountAction.getDefaultConfig;
-import static com.microsoft.azure.toolkit.intellij.cosmos.creation.CreateCosmosDatabaseAction.getDefaultDatabaseConfig;
+import static com.microsoft.azure.toolkit.lib.cosmos.CosmosDBAccountDraft.Config.getDefaultConfig;
+import static com.microsoft.azure.toolkit.lib.cosmos.model.DatabaseConfig.getDefaultDatabaseConfig;
+
 
 public class IntelliJCosmosActionsContributor implements IActionsContributor {
     @Override

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/creation/CosmosDatabaseCreationDialog.java

@@ -11,7 +11,9 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureTextInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
+import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
 import com.microsoft.azure.toolkit.lib.cosmos.model.DatabaseConfig;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -48,16 +50,29 @@ protected void init() {
         buttonGroup.add(manualRadioButton);
         autoscaleRadioButton.addItemListener(e -> toggleThroughputStatus());
         manualRadioButton.addItemListener(e -> toggleThroughputStatus());
-
+        txtName.addValidator(() -> validateDatabaseName());
         txtThroughputRu.setMinValue(400);
         txtThroughputRu.setMaxValue(1000000);
         txtThroughputRu.setValue(400);
+        txtThroughputRu.addValidator(() -> validateThroughputIncrements(txtThroughputRu));
         txtMaxThroughput.setMinValue(1000);
         txtMaxThroughput.setValue(4000);
+        txtMaxThroughput.addValidator(() -> validateThroughputIncrements(txtMaxThroughput));
 
         autoscaleRadioButton.setSelected(true);
     }
 
+    private AzureValidationInfo validateDatabaseName() {
+            final String value = txtName.getValue();
+            return StringUtils.endsWith(value, StringUtils.SPACE) || StringUtils.containsAny(value, "\\", "/","#", "?", "%") ?
+                    AzureValidationInfo.error("Database name not end with space nor contains characters '\\', '/', '#', '?', '%'", txtName) : AzureValidationInfo.success(txtName);
+    }
+
+    private AzureValidationInfo validateThroughputIncrements(@Nonnull AzureIntegerInput input) {
+        final Integer value = input.getValue();
+        return Objects.nonNull(value) && value % 100 == 0 ? AzureValidationInfo.success(input) : AzureValidationInfo.error("Throughput must be in multiples of 100", input);
+    }
+
     private void toggleThroughputStatus() {
         lblMaxThroughput.setVisible(autoscaleRadioButton.isSelected());
         txtMaxThroughput.setVisible(autoscaleRadioButton.isSelected());

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/creation/CreateCosmosDBAccountAction.java

@@ -47,31 +47,6 @@ public static void create(@Nullable Project project, @Nullable CosmosDBAccountDr
         });
     }
 
-    public static CosmosDBAccountDraft.Config getDefaultConfig(@Nullable final ResourceGroup resourceGroup) {
-        final List<Subscription> subs = az(AzureAccount.class).account().getSelectedSubscriptions();
-        Preconditions.checkArgument(CollectionUtils.isNotEmpty(subs), "There are no subscriptions in your account.");
-        final String name = String.format("cosmos-db-%s", Utils.getTimestamp());
-        final String defaultResourceGroupName = String.format("rg-%s", name);
-
-        final Subscription historySub = CacheManager.getUsageHistory(Subscription.class).peek(subs::contains);
-        final ResourceGroup historyRg = CacheManager.getUsageHistory(ResourceGroup.class)
-            .peek(r -> Objects.isNull(historySub) || r.getSubscriptionId().equals(historySub.getId()));
-        final ResourceGroup group = Optional.ofNullable(resourceGroup)
-            .or(() -> Optional.ofNullable(historyRg))
-            .orElse(az(AzureResources.class).groups(subs.get(0).getId())
-                .create(defaultResourceGroupName, defaultResourceGroupName));
-        final Subscription subscription = Optional.of(group).map(AzResource::getSubscription)
-            .or(() -> Optional.ofNullable(historySub))
-            .orElse(subs.get(0));
-
-        final CosmosDBAccountDraft.Config config = new CosmosDBAccountDraft.Config();
-        config.setName(name);
-        config.setSubscription(subscription);
-        config.setResourceGroup(group);
-        config.setKind(DatabaseAccountKind.SQL);
-        return config;
-    }
-
     @AzureOperation(name = "cosmos.create_account.account", params = {"config.getName()"}, type = AzureOperation.Type.ACTION)
     private static void doCreate(final CosmosDBAccountDraft.Config config, final Project project) {
         final AzureString title = OperationBundle.description("cosmos.create_account.account", config.getName());

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/creation/CreateCosmosDatabaseAction.java

@@ -35,13 +35,6 @@ public static <T extends CosmosDBAccount> void create(@Nonnull Project project,
         });
     }
 
-    public static DatabaseConfig getDefaultDatabaseConfig() {
-        final DatabaseConfig result = new DatabaseConfig();
-        result.setName(String.format("database-%s", Utils.getTimestamp()));
-        result.setMaxThroughput(4000);
-        return result;
-    }
-
     @AzureOperation(name = "cosmos.create_database.database|account", params = {"config.getName(), account.getName()"}, type = AzureOperation.Type.ACTION)
     private static <T extends CosmosDBAccount> void doCreate(@Nonnull T account,
                                                              @Nonnull BiFunction<T, DatabaseConfig, ICosmosDatabaseDraft<?, ?>> draftSupplier,