Merge pull request #6124 from microsoft/hanli-fix-validation

Fix validation issue for intellij

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/creation/component/VirtualNetworkDialog.java

@@ -27,7 +27,7 @@ public class VirtualNetworkDialog extends AzureDialog<DraftNetwork> implements A
     private static final String NETWORK_NAME_RULES = "The name must begin with a letter or number, end with a letter, number or underscore, " +
             "and may contain only letters, numbers, underscores, periods, or hyphens.";
     private static final String NETWORK_NAME_PATTERN = "[a-zA-Z0-9][a-zA-Z0-9_\\.-]{0,62}[a-zA-Z0-9_]";
-    private static final String SUBNET_NAME_PATTERN = "[a-zA-Z0-9][a-zA-Z0-9_\\.-]{0,78}[a-zA-Z0-9_]";
+    private static final String SUBNET_NAME_PATTERN = "[a-zA-Z0-9]([a-zA-Z0-9_\\.-]{0,78}[a-zA-Z0-9_])?";
 
     private JPanel contentPane;
     private AzureTextInput txtName;

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/creation/component/ip/PublicIpAddressCreationDialog.java

@@ -27,7 +27,7 @@
 
 public class PublicIpAddressCreationDialog extends AzureDialog<DraftPublicIpAddress>
         implements AzureForm<DraftPublicIpAddress> {
-    private static final String IP_NAME_PATTERN = "[a-zA-Z0-9][a-zA-Z0-9_\\.-]{0,78}[a-zA-Z0-9_]";
+    private static final String IP_NAME_PATTERN = "[a-zA-Z0-9]([a-zA-Z0-9_\\.-]{0,78}[a-zA-Z0-9_])?";
 
     private Subscription subscription;
     private ResourceGroup resourceGroup;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/WebAppBasePropertyView.java

@@ -311,8 +311,8 @@ public void showProperty(WebAppProperty webAppProperty) {
         if (url == null) {
             lnkUrl.setHyperlinkText(TXT_NA);
         } else {
-            lnkUrl.setHyperlinkText("http://" + url);
-            lnkUrl.setHyperlinkTarget("http://" + url);
+            lnkUrl.setHyperlinkText("https://" + url);
+            lnkUrl.setHyperlinkTarget("https://" + url);
         }
         txtPricingTier.setText(webAppProperty.getValue(WebAppPropertyViewPresenter.KEY_PRICING) == null ? TXT_NA
                 : (String) webAppProperty.getValue(WebAppPropertyViewPresenter.KEY_PRICING));

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/docker/webapponlinux/WebAppOnLinuxDeployState.java

@@ -93,7 +93,7 @@ public IAppService executeSteps(@NotNull RunProcessHandler processHandler, @NotN
             processHandler.setText(String.format("Creating new WebApp ... [%s]", deployModel.getWebAppName()));
             final IWebApp app = AzureWebAppMvpModel.getInstance().createAzureWebAppWithPrivateRegistryImage(deployModel);
             if (app != null && app.name() != null) {
-                processHandler.setText(String.format("URL:  http://%s.azurewebsites.net/", app.name()));
+                processHandler.setText(String.format("URL:  https://%s.azurewebsites.net/", app.name()));
                 updateConfigurationDataModel(app);
 
                 AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, null));
@@ -105,7 +105,7 @@ public IAppService executeSteps(@NotNull RunProcessHandler processHandler, @NotN
                     deployModel.getWebAppName()));
             final IWebApp app = AzureWebAppMvpModel.getInstance().updateWebAppOnDocker(deployModel.getWebAppId(), acrInfo);
             if (app != null && app.name() != null) {
-                processHandler.setText(String.format("URL:  http://%s.azurewebsites.net/", app.name()));
+                processHandler.setText(String.format("URL:  https://%s.azurewebsites.net/", app.name()));
             }
             return app;
         }

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/util/ValidationUtils.java

@@ -58,8 +58,14 @@ public static void validateAppServiceName(String subscriptionId, String appServi
         if (StringUtils.isEmpty(subscriptionId)) {
             throw new IllegalArgumentException(message("appService.subscription.validate.empty"));
         }
+        if (StringUtils.isEmpty(appServiceName)) {
+            throw new IllegalArgumentException(message("appService.name.validate.empty"));
+        }
+        if (appServiceName.length() < 2 || appServiceName.length() > 60) {
+            throw new IllegalArgumentException(message("appService.name.validate.length"));
+        }
         if (!isValidAppServiceName(appServiceName)) {
-            throw new IllegalArgumentException(message("appService.subscription.validate.invalidName"));
+            throw new IllegalArgumentException(message("appService.name.validate.invalidName"));
         }
         final CheckNameAvailabilityResultEntity result = Azure.az(AzureAppService.class).checkNameAvailability(subscriptionId, appServiceName);
         if (!result.isAvailable()) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/com/microsoft/intellij/ui/messages/messages.properties

@@ -1367,7 +1367,9 @@ appService.deploy.hint.succeed=Deploy succeed
 appService.deploy.hint.failed=Deploy failed!
 appService.runProcess.hint.processTerminated=The process has been terminated
 appService.subscription.validate.empty=Subscription can not be null
-appService.subscription.validate.invalidName=App service names only allow alphanumeric characters and hyphens, cannot start or end in a hyphen, and must be less than 60 chars.
+appService.name.validate.empty=App service names can not be null
+appService.name.validate.length=App service names be at least 2 characters, and be fewer than 60 characters
+appService.name.validate.invalidName=App service names only allow alphanumeric characters and hyphens, cannot start or end in a hyphen, and must be less than 60 chars.
 appService.logStreaming.hint.connect=Connecting to log stream...
 appService.logStreaming.hint.notStart=Streaming log is not started.
 appService.logStreaming.hint.disconnected=Disconnected from log-streaming service.

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppNode.java

@@ -146,7 +146,7 @@ private void openInPortal() {
 
     @AzureOperation(name = "webapp.open_browser", params = {"this.webApp.name()"}, type = AzureOperation.Type.ACTION)
     private void openInBrowser() {
-        DefaultLoader.getUIHelper().openInBrowser("http://" + this.webApp.hostName());
+        DefaultLoader.getUIHelper().openInBrowser("https://" + this.webApp.hostName());
     }
 
     @AzureOperation(name = "webapp.show_properties", params = {"this.webApp.name()"}, type = AzureOperation.Type.ACTION)

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/deploymentslot/DeploymentSlotNode.java

@@ -134,7 +134,7 @@ private void openInPortal() {
 
     @AzureOperation(name = "webapp|deployment.open_browser", params = {"this.slot.name()", "this.webApp.name()"}, type = AzureOperation.Type.ACTION)
     private void openInBrowser() {
-        DefaultLoader.getUIHelper().openInBrowser("http://" + slot.hostName());
+        DefaultLoader.getUIHelper().openInBrowser("https://" + slot.hostName());
     }
 
     @AzureOperation(name = "webapp|deployment.show_properties", params = {"this.slot.name()", "this.webApp.name()"}, type = AzureOperation.Type.ACTION)