Unify account description message in azure gradle plugin, AB#2071915
This commit is contained in:
Родитель
828f6b842f
Коммит
7e38444362
|
@ -106,8 +106,8 @@ public class GradleAuthHelper {
|
||||||
return account;
|
return account;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void printCredentialDescription(Account account, boolean skipType) {
|
private static void printCredentialDescription(Account account, boolean isInteractiveLogin) {
|
||||||
if (skipType) {
|
if (isInteractiveLogin) {
|
||||||
if (CollectionUtils.isNotEmpty(account.getSubscriptions())) {
|
if (CollectionUtils.isNotEmpty(account.getSubscriptions())) {
|
||||||
final List<Subscription> selectedSubscriptions = account.getSelectedSubscriptions();
|
final List<Subscription> selectedSubscriptions = account.getSelectedSubscriptions();
|
||||||
if (selectedSubscriptions != null && selectedSubscriptions.size() == 1) {
|
if (selectedSubscriptions != null && selectedSubscriptions.size() == 1) {
|
||||||
|
@ -116,12 +116,8 @@ public class GradleAuthHelper {
|
||||||
selectedSubscriptions.get(0).getId()));
|
selectedSubscriptions.get(0).getId()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (StringUtils.isNotEmpty(account.getUsername())) {
|
|
||||||
AzureMessager.getMessager().info(AzureString.format("Username: %s", account.getUsername()));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
AzureMessager.getMessager().info(account.toString());
|
|
||||||
}
|
}
|
||||||
|
AzureMessager.getMessager().info(account.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void promptAzureEnvironment(AzureEnvironment env) {
|
private static void promptAzureEnvironment(AzureEnvironment env) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче