Merge pull request #6814 from microsoft/fix-validation

wangmingliang-ms · web-flow · commit 2d19361af882 · 2022-07-29T13:50:59.000+08:00
Fix validation for dns name prefix
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/creation/KubernetesCreationDialog.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/creation/KubernetesCreationDialog.java
@@ -263,12 +263,12 @@ private AzureValidationInfo validateKubernetesClusterName() {
     private AzureValidationInfo validateDnsNamePrefix() {
         final String name = txtDnsPrefix.getValue();
         if (StringUtils.isEmpty(name)) {
-            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtName);
+            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtDnsPrefix);
         }
         if (!DNS_NAME_PREFIX_PATTERN.matcher(name).matches()) {
-            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtName);
+            return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtDnsPrefix);
         }
-        return AzureValidationInfo.success(txtName);
+        return AzureValidationInfo.success(txtDnsPrefix);
     }
 
     // CHECKSTYLE IGNORE check FOR NEXT 1 LINES

Original file line number	Diff line number	Diff line change
`@@ -263,12 +263,12 @@ private AzureValidationInfo validateKubernetesClusterName() {`
`263`	`263`	`private AzureValidationInfo validateDnsNamePrefix() {`
`264`	`264`	`final String name = txtDnsPrefix.getValue();`
`265`	`265`	`if (StringUtils.isEmpty(name)) {`
`266`		`- return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtName);`
	`266`	`+ return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.empty").toString(), txtDnsPrefix);`
`267`	`267`	`}`
`268`	`268`	`if (!DNS_NAME_PREFIX_PATTERN.matcher(name).matches()) {`
`269`		`- return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtName);`
	`269`	`+ return AzureValidationInfo.error(AzureMessageBundle.message("kubernetes.cluster.dnsNamePrefix.validate.invalid").toString(), txtDnsPrefix);`
`270`	`270`	`}`
`271`		`- return AzureValidationInfo.success(txtName);`
	`271`	`+ return AzureValidationInfo.success(txtDnsPrefix);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`// CHECKSTYLE IGNORE check FOR NEXT 1 LINES`