Skip to content

Commit 97669d1

Browse files
wangmingliang-mswangmingliang-ms
authored
Merge pull request #6296 from microsoft/hotfix-settings
#1905738: [Test]An error pops up when opening the settings causing settings page not work for new users
2 parents 495d883 + 89ddba4 commit 97669d1

File tree

5 files changed

+29
-31
lines changed

5 files changed

+29
-31
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
44

55
- [Change Log](#change-log)
6+
- [3.60.1](#3601)
67
- [3.60.0](#3600)
78
- [3.59.0](#3590)
89
- [3.58.0](#3580)
@@ -76,6 +77,11 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
7677
- [3.0.7](#307)
7778
- [3.0.6](#306)
7879

80+
## 3.60.1
81+
### Fixed
82+
- [#6294](https://github.com/microsoft/azure-tools-for-java/issues/6294): Uncaught Exception cannot create configurable component java.lang.NullPointerException
83+
- Signin status will not keep after restarting if user signed in with Service Principal
84+
7985
## 3.60.0
8086
### Added
8187
- Add dependency support for Azure Functions related libs, so that our plugin can be recommended.

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/whatsnew.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<!-- Version: 3.58.0 -->
22
# What's new in Azure Toolkit for IntelliJ
33

4+
## 3.60.1
5+
### Fixed
6+
- [#6294](https://github.com/microsoft/azure-tools-for-java/issues/6294): Uncaught Exception cannot create configurable component java.lang.NullPointerException
7+
- Signin status will not keep after restarting if user signed in with Service Principal
8+
49
## 3.60.0
510
### Added
611
- Add dependency support for Azure Functions related libs, so that our plugin can be recommended.

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/ui/AzurePanel.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.intellij.util.ui.UIUtil;
1616
import com.microsoft.azure.toolkit.ide.common.store.AzureConfigInitializer;
1717
import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
18+
import com.microsoft.azure.toolkit.intellij.connector.Password;
1819
import com.microsoft.azure.toolkit.intellij.connector.database.component.PasswordSaveComboBox;
1920
import com.microsoft.azure.toolkit.lib.Azure;
2021
import com.microsoft.azure.toolkit.lib.AzureConfiguration;
@@ -71,7 +72,7 @@ public void init() {
7172
azureEnvironmentComboBox.setRenderer(new SimpleListCellRenderer<>() {
7273
@Override
7374
public void customize(@NotNull JList list, AzureEnvironment value, int index, boolean selected, boolean hasFocus) {
74-
setText(azureEnvironmentDisplayString(value));
75+
setText(azureEnvironmentDisplayString(value));
7576
}
7677
});
7778
azureEnvDesc.setForeground(UIUtil.getContextHelpForeground());
@@ -92,7 +93,12 @@ public void setData(AzureConfiguration config) {
9293
//ignore
9394
funcCoreToolsPath.setValue(config.getFunctionCoreToolsPath());
9495
}
95-
savePasswordComboBox.setValue(new AzureComboBox.ItemReference<>(config.getDatabasePasswordSaveType().toLowerCase(), e -> e.name().toLowerCase()));
96+
final String passwordSaveType = config.getDatabasePasswordSaveType();
97+
if (Objects.nonNull(passwordSaveType)) {
98+
savePasswordComboBox.setValue(new AzureComboBox.ItemReference<>(passwordSaveType, e -> e.name().toLowerCase()));
99+
} else {
100+
savePasswordComboBox.setValue(Password.SaveType.UNTIL_RESTART);
101+
}
96102
allowTelemetryCheckBox.setSelected(config.getTelemetryEnabled());
97103

98104
azureEnvironmentComboBox.setSelectedItem(ObjectUtils.firstNonNull(AzureEnvironmentUtils.stringToAzureEnvironment(config.getCloud()),

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:xi="http://www.w3.org/2001/XInclude">
33
<id>com.microsoft.tooling.msservices.intellij.azure</id>
44
<name>Azure Toolkit for IntelliJ</name>
5-
<version>3.60.0</version>
5+
<version>3.60.1</version>
66
<vendor email="[email protected]" url="http://www.microsoft.com">Microsoft</vendor>
77

88
<description><![CDATA[
@@ -25,35 +25,11 @@
2525
<change-notes>
2626
<![CDATA[
2727
<html>
28-
<h3>3.60.0</h3>
29-
<h4>Added</h4>
30-
<ul>
31-
<li>Add dependency support for Azure Functions related libs, so that our plugin can be recommended.</li>
32-
<li>Add actions on some error notifications, so that user knows what to do next.</li>
33-
<li>Add account registration link in "Sign in" dialog.</li>
34-
<ul>
35-
36-
<h4>Changed</h4>
37-
<ul>
38-
<li>Performance of restoring-sign-in is improved.</li>
39-
<ul>
40-
28+
<h3>3.60.1</h3>
4129
<h4>Fixed</h4>
4230
<ul>
43-
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/6120">#6120</a>: AzureOperationException: list all function modules in project.</li>
44-
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/6090">#6090</a>: Uncaught Exception java.nio.file.InvalidPathException: Illegal char <:> at index 16: Active code page: 1252.</li>
45-
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/5038">#5038</a>: Dependent Module Jars Are Not Added When Debugging With IDEA.</li>
46-
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/5035">#5035</a>: Resources Are Not Added To Jar When Debugging With IDEA.</li>
47-
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/6026">#6026</a>: Uncaught Exception java.lang.NullPointerException.</li>
48-
<li>Azure Explorer: some nodes are not sorted in natural order.</li>
49-
<li>Azure Explorer: keeps showing "signing in..." for a long time after restarting IntelliJ.</li>
50-
<li>Virtual Machine: Validation info about name of resource group and virtual machine doesn't contain letters length.</li>
51-
<li>Storage Account: "open in portal" and "open storage explorer" link to a same page.</li>
52-
<li>Spring Cloud: there is No default value for CPU and Memory if click more settings quickly in "Create Spring Cloud App" dialog.</li>
53-
<li>MySQL/SqlServer/PostgreSQL: Test connection result text box has white background color in IntelliJ Light theme.</li>
54-
<li>Postgre SQL: No icon in properties view tab title.</li>
55-
<li>Some message/icon related bugs.</li>
56-
<li>CVE issues</li>
31+
<li><a href="https://github.com/microsoft/azure-tools-for-java/issues/6294">#6294</a>: Uncaught Exception cannot create configurable component java.lang.NullPointerException.</li>
32+
<li>Signin status will not keep after restarting if user signed in with Service Principal.</li>
5733
<ul>
5834
<p>You may get the full change log <a href="https://github.com/Microsoft/azure-tools-for-java/blob/develop/CHANGELOG.md">here</a></p>
5935
</html>

‎Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/IdentityAzureManager.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ public Mono<AuthMethodDetails> restoreSignIn(AuthMethodDetails authMethodDetails
153153
AuthConfiguration auth = new AuthConfiguration();
154154
auth.setType(AuthType.SERVICE_PRINCIPAL);
155155
auth.setClient(authMethodDetails.getClientId());
156-
auth.setTenant(authMethodDetails.getTenantId());
156+
if (CollectionUtils.isNotEmpty(authMethodDetails.getTenantIds())) {
157+
auth.setTenant(authMethodDetails.getTenantIds().get(0));
158+
} else {
159+
auth.setTenant(authMethodDetails.getTenantId());
160+
}
161+
157162
auth.setEnvironment(Azure.az(AzureCloud.class).get());
158163
if (StringUtils.isNotBlank(authMethodDetails.getCertificate())) {
159164
auth.setCertificate(authMethodDetails.getCertificate());

0 commit comments

Comments
 (0)