Merge branch 'qianjin-sqlserver-04-showproperties-4-actions' into qianjin-sqlserver-05-all

Author: shenqianjin

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task/CreateSqlServerTask.java

@@ -5,17 +5,17 @@
 
 package com.microsoft.azure.toolkit.intellij.sqlserver.task;
 
-import com.microsoft.azure.management.Azure;
-import com.microsoft.azure.management.resources.ResourceGroup;
 import com.microsoft.azure.toolkit.intellij.common.Draft;
+import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
+import com.microsoft.azure.toolkit.lib.resource.AzureGroup;
+import com.microsoft.azure.toolkit.lib.resource.ResourceGroupEntity;
 import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
 import com.microsoft.azure.toolkit.lib.sqlserver.model.SqlServerEntity;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.AzureSqlServer;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.ISqlServer;
 import com.microsoft.azuretools.ActionConstants;
-import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetrywrapper.ErrorType;
 import com.microsoft.azuretools.telemetrywrapper.EventType;
@@ -49,16 +49,13 @@ public ISqlServer execute() {
             EventUtil.logEvent(EventType.info, operation, Collections.singletonMap(TelemetryConstants.SUBSCRIPTIONID, subscriptionId));
             // create resource group if necessary.
             if (config.getResourceGroup() instanceof Draft) {
-                Azure azure = AuthMethodManager.getInstance().getAzureClient(subscriptionId);
-                ResourceGroup newResourceGroup = azure.resourceGroups().define(config.getResourceGroup().name()).withRegion(config.getRegion().getName()).create();
+                ResourceGroupEntity newResourceGroup = Azure.az(AzureGroup.class)
+                    .subscription(subscriptionId).create(config.getResourceGroup().name(), config.getRegion().getName());
                 config.setResourceGroup(newResourceGroup);
             }
             // create sql server
-            SqlServerEntity entity = SqlServerEntity.builder().name(config.getServerName()).subscriptionId(config.getSubscription().subscriptionId())
-                    .resourceGroup(config.getResourceGroup().name()).region(Region.fromName(config.getRegion().getName())).administratorLoginName(config.getAdminUsername())
-                    .enableAccessFromAzureServices(config.isAllowAccessFromAzureServices()).enableAccessFromLocalMachine(config.isAllowAccessFromLocalMachine())
-                    .build();
-            return com.microsoft.azure.toolkit.lib.Azure.az(AzureSqlServer.class).sqlServer(entity).create()
+            SqlServerEntity entity = this.fromConfig(this.config);
+            return Azure.az(AzureSqlServer.class).sqlServer(entity).create()
                     .withAdministratorLoginPassword(String.valueOf(config.getPassword()))
                     .commit();
         } catch (final RuntimeException e) {
@@ -69,4 +66,11 @@ public ISqlServer execute() {
         }
     }
 
+    private SqlServerEntity fromConfig(SqlServerConfig config) {
+        return SqlServerEntity.builder().name(config.getServerName()).subscriptionId(config.getSubscription().subscriptionId())
+                .resourceGroup(config.getResourceGroup().name()).region(Region.fromName(config.getRegion().getName())).administratorLoginName(config.getAdminUsername())
+                .enableAccessFromAzureServices(config.isAllowAccessFromAzureServices()).enableAccessFromLocalMachine(config.isAllowAccessFromLocalMachine())
+                .build();
+    }
+
 }