Merge pull request #6088 from microsoft/fixes/app-service

Fix validation and UI issues for app service

Author: Flanker32

PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties

@@ -14,7 +14,7 @@ depLocation=dependencies/
 excp=Exception in getClasspathEntries
 azureSDKcontainerID=com.microsoft.azuretools.SDK_CONTAINER
 sdkID=com.microsoft.azuretools.sdk
-sdkJar=dependencies/azure-1.38.0.jar
+sdkJar=dependencies/azure-1.41.2.jar
 jstDep=org.eclipse.jst.component.dependency
 aiCheckBoxTxt=Enable telemetry with Application Insights
 webxmlPath=WebContent/WEB-INF/web.xml

PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties

@@ -7,7 +7,7 @@ lblVersion=Version :
 libNotAvail=Library is not available.
 notFound=Not found
 sdkID=com.microsoft.azuretools.sdk
-sdkJar=dependencies/azure-1.38.0.jar
+sdkJar=dependencies/azure-1.41.2.jar
 title=Microsoft Azure Libraries for Java
 verNotAvail=The selected version is not available.
 version1=Microsoft Azure Libraries for Java, version %s.%s.%s

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azure/toolkit/eclipse/common/component/AzureComboBox.java

@@ -223,7 +223,7 @@ public List<T> getItems() {
     }
 
     protected synchronized void setItems(final List<? extends T> items) {
-        AzureTaskManager.getInstance().runAndWait(() -> {
+        AzureTaskManager.getInstance().runLater(() -> {
             if (this.isDisposed()) {
                 return;
             }

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azure/toolkit/eclipse/common/component/resourcegroup/ResourceGroupComboBox.java

@@ -90,7 +90,7 @@ protected Control getExtension() {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 super.widgetSelected(e);
-                ResourceGroupCreationDialog dialog = new ResourceGroupCreationDialog(ResourceGroupComboBox.this.getShell());
+                ResourceGroupCreationDialog dialog = new ResourceGroupCreationDialog(ResourceGroupComboBox.this.getShell(), subscription);
                 if (dialog.open() == Window.OK) {
                     DraftResourceGroup resourceGroupDraft = dialog.getData();
                     draftItems.add(0, resourceGroupDraft);

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azure/toolkit/eclipse/common/component/resourcegroup/ResourceGroupCreationDialog.java

@@ -7,7 +7,9 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -16,22 +18,33 @@
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import com.microsoft.azure.toolkit.eclipse.common.component.AzureTextInput;
+
+import com.microsoft.azure.CloudException;
 import com.microsoft.azure.toolkit.eclipse.common.component.AzureDialog;
+import com.microsoft.azure.toolkit.eclipse.common.component.AzureTextInput;
+import com.microsoft.azure.toolkit.lib.Azure;
 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.common.messager.AzureMessageBundle;
+import com.microsoft.azure.toolkit.lib.common.model.Subscription;
+import com.microsoft.azure.toolkit.lib.resource.AzureGroup;
 
 public class ResourceGroupCreationDialog extends AzureDialog<DraftResourceGroup> implements AzureForm<DraftResourceGroup> {
+    private static final Pattern PATTERN = Pattern.compile("[a-z0-9._()-]+[a-z0-9_()-]$");
+
     private AzureTextInput textName;
+    private Subscription subscription;
 
     /**
      * Create the dialog.
      *
      * @param parentShell
      */
-    public ResourceGroupCreationDialog(Shell parentShell) {
+    public ResourceGroupCreationDialog(Shell parentShell, Subscription subscription) {
         super(parentShell);
         setShellStyle(SWT.CLOSE | SWT.MIN | SWT.MAX | SWT.RESIZE);
+        this.subscription = subscription;
     }
 
     /**
@@ -47,9 +60,9 @@ protected Control createDialogArea(Composite parent) {
         gridLayout.marginWidth = 5;
 
         Label lblNewLabel = new Label(container, SWT.WRAP);
-        GridData gd_lblNewLabel = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-        gd_lblNewLabel.widthHint = 160;
-        lblNewLabel.setLayoutData(gd_lblNewLabel);
+        GridData gdLblNewLabel = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
+        gdLblNewLabel.widthHint = 160;
+        lblNewLabel.setLayoutData(gdLblNewLabel);
         lblNewLabel.setText("A resource group is a container that holds related resources for an Azure solution.");
 
         Label lblName = new Label(container, SWT.NONE);
@@ -58,6 +71,7 @@ protected Control createDialogArea(Composite parent) {
         textName = new AzureTextInput(container, SWT.BORDER);
         textName.setRequired(true);
         textName.setLabeledBy(lblName);
+        textName.addValidator(() -> validateResourceGroupName());
         GridData textGrid = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
         textGrid.widthHint = 257;
         textName.setLayoutData(textGrid);
@@ -102,4 +116,32 @@ public void setValue(DraftResourceGroup draft) {
     public List<AzureFormInput<?>> getInputs() {
         return Arrays.asList(textName);
     }
+
+    // Copied from com.microsoft.azure.toolkit.intellij.common.component.resourcegroup.ResourceGroupNameTextField
+    private AzureValidationInfo validateResourceGroupName() {
+        final String value = textName.getValue();
+        // validate length
+        int minLength = 1;
+        int maxLength = 90;
+        if (StringUtils.length(value) < minLength) {
+            return AzureValidationInfo.builder().input(this)
+                .message("The value must not be empty.")
+                .type(AzureValidationInfo.Type.ERROR).build();
+        } else if (StringUtils.length(value) > maxLength) {
+            return AzureValidationInfo.error(AzureMessageBundle.message("common.resourceGroup.validate.length", maxLength).toString(), textName);
+        }
+        // validate special character
+        if (!PATTERN.matcher(value).matches()) {
+            return AzureValidationInfo.error(AzureMessageBundle.message("common.resourceGroup.validate.invalid").toString(), textName);
+        }
+        // validate availability
+        try {
+            if (!Azure.az(AzureGroup.class).checkNameAvailability(subscription.getId(), value)) {
+                return AzureValidationInfo.builder().input(this).message(value + " already existed.").type(AzureValidationInfo.Type.ERROR).build();
+            }
+        } catch (CloudException e) {
+            return AzureValidationInfo.builder().input(this).message(e.getMessage()).type(AzureValidationInfo.Type.ERROR).build();
+        }
+        return AzureValidationInfo.success(textName);
+    }
 }

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties

@@ -56,7 +56,7 @@ err=Error
 prefFileName=WAEclipsePlugin
 bundleName=org.eclipse.core.runtime
 sdkLibBundleName=com.microsoftopentechnologies.windowsazure.tools.sdk
-sdkLibBaseJar=dependencies/azure-1.38.0.jar
+sdkLibBaseJar=dependencies/azure-1.41.2.jar
 SDKLocErrMsg=Error occurred while retrieving path of Azure libraries
 resCLExWkspRfrsh=Exception while refresh of workspace.
 cmhLblStrgAcc=Storage Accounts

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azure/toolkit/eclipse/appservice/CreateWebAppDialog.java

@@ -79,6 +79,7 @@ protected Control createDialogArea(Composite parent) {
         SubscriptionComboBox subscriptionComboBox = subsAndResourceGroupPanel.getSubscriptionComboBox();
         subscriptionComboBox.addValueChangedListener(event -> {
             Subscription subs = subscriptionComboBox.getValue();
+            instanceDetailPanel.setSubscription(subs);
             instanceDetailPanel.getRegionComboBox().setSubscription(subs);
             appServicePlanPanel.getServicePlanCombobox().setSubscription(subs);
         });

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azure/toolkit/eclipse/appservice/CreateWebAppInstanceDetailComposite.java

@@ -112,14 +112,14 @@ public List<AzureFormInput<?>> getInputs() {
         return Arrays.asList(text, cbRuntime, cbRegion);
     }
 
-    public AzureValidationInfo validateAppName() {
+    private AzureValidationInfo validateAppName() {
         if (subscription == null) {
             return AzureValidationInfo.success(text);
         }
-        CheckNameAvailabilityResultEntity result = Azure.az(AzureAppService.class)
+        final CheckNameAvailabilityResultEntity result = Azure.az(AzureAppService.class)
                 .checkNameAvailability(subscription.getId(), text.getValue());
         return result.isAvailable() ? AzureValidationInfo.success(text)
-                : AzureValidationInfo.error(result.getUnavailabilityReason(), text);
+                : AzureValidationInfo.error(result.getUnavailabilityMessage(), text);
     }
 
     @Override

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azure/toolkit/eclipse/appservice/platform/RuntimeComboBox.java

@@ -29,12 +29,13 @@ public RuntimeComboBox(Composite parent) {
     }
 
     public RuntimeComboBox(Composite parent, List<Runtime> platformList) {
-        super(parent);
-        this.platformList = ListUtils.unmodifiableList(platformList);
+        super(parent, false);
+        setPlatformList(platformList);
     }
 
     public void setPlatformList(final List<Runtime> platformList) {
         this.platformList = ListUtils.unmodifiableList(platformList);
+        this.refreshItems();
     }
 
     @Override

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azure/toolkit/eclipse/appservice/serviceplan/ServicePlanCreationDialog.java

@@ -11,6 +11,8 @@
 import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
 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.common.messager.AzureMessageBundle;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -22,9 +24,11 @@
 import java.util.Optional;
 
 public class ServicePlanCreationDialog extends AzureDialog<DraftServicePlan> implements AzureForm<DraftServicePlan> {
+    private static final String APP_SERVICE_PLAN_NAME_PATTERN = "[a-zA-Z0-9\\-]{1,40}";
     private AzureTextInput text;
     private PricingTierCombobox pricingTierCombobox;
     private DraftServicePlan data;
+    private List<PricingTier> pricingTiers = null;
 
     public ServicePlanCreationDialog(Shell parentShell) {
         super(parentShell);
@@ -54,6 +58,7 @@ protected Control createDialogArea(Composite parent) {
 
         text = new AzureTextInput(container, SWT.BORDER);
         text.setRequired(true);
+        text.addValidator(() -> validateAppServicePlanName());
         GridData textGrid = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
         textGrid.widthHint = 257;
         text.setLabeledBy(lblName);
@@ -77,8 +82,6 @@ public void setPricingTier(List<PricingTier> pricingTiers) {
 
     }
 
-    private List<PricingTier> pricingTiers = null;
-
     public DraftServicePlan getData() {
         return data;
     }
@@ -117,4 +120,13 @@ public void setValue(DraftServicePlan draft) {
     public List<AzureFormInput<?>> getInputs() {
         return Arrays.asList(text, pricingTierCombobox);
     }
+
+    private AzureValidationInfo validateAppServicePlanName() {
+        final String appServicePlan = text.getValue();
+        if (!appServicePlan.matches(APP_SERVICE_PLAN_NAME_PATTERN)) {
+            return AzureValidationInfo.error(AzureMessageBundle.message("appService.servicePlan.validate.invalidName",
+                    APP_SERVICE_PLAN_NAME_PATTERN).toString(), text);
+        }
+        return AzureValidationInfo.success(text);
+    }
 }