Skip to content

Commit 3c13c4e

Browse files
fix ServiceNameInput validation.
1 parent 86dd39f commit 3c13c4e

File tree

2 files changed

+6
-3
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component
  • Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit

2 files changed

+6
-3
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/component/ServiceNameInput.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ public AzureValidationInfo doValidateValue() {
4646
if (!name.matches(NAME_REGEX)) {
4747
throw new IllegalArgumentException("It can contain only lowercase letters, numbers and hyphens and the first character must be a letter but the last character can be a letter or number.");
4848
}
49-
final NameAvailability result = Azure.az(AzureSpringCloud.class).forSubscription(this.subscription.getId()).checkNameAvailability(this.region, name);
50-
if (!result.nameAvailable()) {
51-
throw new IllegalArgumentException(result.reason());
49+
if (Objects.nonNull(this.subscription) && Objects.nonNull(this.region)) {
50+
final NameAvailability result = Azure.az(AzureSpringCloud.class).forSubscription(this.subscription.getId()).checkNameAvailability(this.region, name);
51+
if (!result.nameAvailable()) {
52+
throw new IllegalArgumentException(result.reason());
53+
}
5254
}
5355
} catch (final IllegalArgumentException e) {
5456
return AzureValidationInfo.error(e.getMessage(), this);

Utils/azure-toolkit-ide-libs/azure-toolkit-ide-common-lib/src/main/resources/bundles/com/microsoft/azure/toolkit/operation.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ azure/function.trigger_function.func=treat function ({0})
208208
azure/springcloud.enable_remote_debugging.deployment=enable remote debugging of deployment ({0})
209209
azure/springcloud.disable_remote_debugging.deployment=disable remote debugging of deployment ({0})
210210
azure/springcloud.scale_app_instances.deployment=scaling instances of deployment ({0})
211+
azure/springcloud.check_name.name=validate name ({0}) of new Spring Apps
211212
######################end other request operations######################
212213
######################start create/update request operations######################
213214
azure/ai.create_ai.ai=create Application Insights ({0})

0 commit comments

Comments
 (0)