Skip to content

Commit 7ddf2b7

Browse files
fengshuaihufengshuaihu
committed
Merge branch 'develop' into users/v-shufeng/code-cleanup
# Conflicts: # PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle # Utils/azure-toolkit-ide-hdinsight-libs/pom.xml # Utils/pom.xml
2 parents 053c2d3 + 0a2017b commit 7ddf2b7

File tree

111 files changed

+1510
-359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1510
-359
lines changed

‎CHANGELOG.md

Lines changed: 9 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.84.0](#3840)
67
- [3.83.0](#3830)
78
- [3.82.0](#3820)
89
- [3.81.0](#3810)
@@ -105,6 +106,14 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
105106
- [3.0.7](#307)
106107
- [3.0.6](#306)
107108

109+
## 3.84.0
110+
### Added
111+
- Browse Azure sample projects and create new project from them.
112+
- More "shortcut" actions to manage Azure Kubernetes Service (AKS) resources with bundled Kubernetes plugin (2023.3).
113+
114+
### Updated
115+
- Migrate to use App Service stack API to get supported runtimes for Azure WebApps/Functions.
116+
108117
## 3.83.0
109118
### Added
110119
- Add Azure Key Vault support in Azure Toolkits

‎PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>com.microsoft.azuretools</groupId>
2929
<artifactId>utils</artifactId>
30-
<version>3.84.0-SNAPSHOT</version>
30+
<version>3.85.0-SNAPSHOT</version>
3131
</parent>
3232
<groupId>com.microsoft.azuretools</groupId>
3333
<artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
3939
</organization>
4040

4141
<properties>
42-
<azuretool.version>3.84.0-SNAPSHOT</azuretool.version>
42+
<azuretool.version>3.85.0-SNAPSHOT</azuretool.version>
4343
<azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
44-
<azure.toolkit-lib.version>0.40.0-SNAPSHOT</azure.toolkit-lib.version>
44+
<azure.toolkit-lib.version>0.41.0-SNAPSHOT</azure.toolkit-lib.version>
4545
</properties>
4646
<dependencyManagement>
4747
<dependencies>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
4343
com.microsoft.azuretools.appservice.handlers,
4444
com.microsoft.azuretools.appservice.ui
4545
Bundle-ClassPath: .,
46-
target/lib/azure-toolkit-ide-appservice-lib-0.40.0-SNAPSHOT.jar
46+
target/lib/azure-toolkit-ide-appservice-lib-0.41.0-SNAPSHOT.jar

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-appservice-lib</artifactId>
16-
<version>0.40.0-SNAPSHOT</version>
16+
<version>0.41.0-SNAPSHOT</version>
1717
</dependency>
1818
</dependencies>
1919
<repositories>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
2323
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2424
Bundle-ActivationPolicy: lazy
2525
Bundle-ClassPath: .,
26-
target/lib/azure-toolkit-ide-springcloud-lib-0.40.0-SNAPSHOT.jar
26+
target/lib/azure-toolkit-ide-springcloud-lib-0.41.0-SNAPSHOT.jar
2727
Import-Package: com.microsoft.azuretools.core.actions,
2828
org.eclipse.core.expressions,
2929
org.eclipse.jface.text.hyperlink,

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
16-
<version>0.40.0-SNAPSHOT</version>
16+
<version>0.41.0-SNAPSHOT</version>
1717
</dependency>
1818
</dependencies>
1919
<build>

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/task/CreateFunctionAppTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.microsoft.azure.toolkit.ide.guidance.task.SignInTask;
77
import com.microsoft.azure.toolkit.lib.Azure;
88
import com.microsoft.azure.toolkit.lib.appservice.function.FunctionAppBase;
9-
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
9+
import com.microsoft.azure.toolkit.lib.appservice.model.FunctionAppRuntime;
1010
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
1111
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
1212
import com.microsoft.azure.toolkit.lib.common.model.Subscription;
@@ -43,7 +43,7 @@ public void execute() throws Exception {
4343
final FunctionAppConfig functionAppConfig = FunctionAppConfig.getFunctionAppDefaultConfig(name);
4444
functionAppConfig.setName(name);
4545
functionAppConfig.setSubscription(subscription);
46-
functionAppConfig.setRuntime(Runtime.FUNCTION_WINDOWS_JAVA17);
46+
functionAppConfig.setRuntime(FunctionAppRuntime.getDefault());
4747
final FunctionAppBase<?, ?, ?> app = FunctionAppService.getInstance().createOrUpdateFunctionApp(functionAppConfig);
4848
context.applyResult(FUNCTION_ID, app.getId());
4949
context.applyResult(RESOURCE_GROUP, app.getResourceGroupName());

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/task/CreateWebAppTask.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.microsoft.azure.toolkit.ide.guidance.task.SignInTask;
77
import com.microsoft.azure.toolkit.lib.Azure;
88
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
9+
import com.microsoft.azure.toolkit.lib.appservice.model.WebAppRuntime;
910
import com.microsoft.azure.toolkit.lib.appservice.webapp.WebApp;
1011
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
1112
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
@@ -47,7 +48,7 @@ public void execute() throws Exception {
4748
final WebAppConfig webAppConfig = WebAppConfig.getWebAppDefaultConfig(name);
4849
webAppConfig.setName(name);
4950
webAppConfig.setSubscription(subscription);
50-
webAppConfig.setRuntime(Runtime.LINUX_JAVA17);
51+
webAppConfig.setRuntime(WebAppRuntime.getDefaultJavaseRuntime());
5152
final String rgName = Utils.generateRandomResourceName(String.format("rg-%s", name), 90);
5253
final ResourceGroupConfig newGroupConfig = ResourceGroupConfig.builder().subscriptionId(subscription.getId()).name(rgName).region(webAppConfig.getRegion()).build();
5354
webAppConfig.setResourceGroup(newGroupConfig);

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceInfoAdvancedPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public void setValidPricingTier(List<PricingTier> pricingTier, PricingTier defau
265265
selectorServicePlan.setValidPricingTierList(pricingTier, defaultPricingTier);
266266
}
267267

268-
public void setValidRuntime(List<Runtime> runtimes) {
268+
public void setValidRuntime(List<? extends Runtime> runtimes) {
269269
selectorRuntime.setPlatformList(runtimes);
270270
}
271271

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice-java/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/function/FunctionAppConfigFormPanelAdvance.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
1212
import com.microsoft.azure.toolkit.intellij.legacy.appservice.AppServiceInfoAdvancedPanel;
1313
import com.microsoft.azure.toolkit.intellij.legacy.appservice.AppServiceMonitorPanel;
14-
import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
15-
import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
14+
import com.microsoft.azure.toolkit.lib.appservice.model.*;
1615
import com.microsoft.azure.toolkit.intellij.legacy.appservice.insights.ApplicationInsightsComboBox;
1716
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
1817
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
@@ -26,6 +25,7 @@
2625
import java.util.ArrayList;
2726
import java.util.List;
2827
import java.util.Optional;
28+
import java.util.stream.Collectors;
2929

3030
public class FunctionAppConfigFormPanelAdvance extends JPanel implements AzureFormPanel<FunctionAppConfig> {
3131
private final Project project;
@@ -85,7 +85,7 @@ protected void textChanged(@Nonnull final DocumentEvent documentEvent) {
8585
private void createUIComponents() {
8686
// TODO: place custom component creation code here
8787
appServiceConfigPanelAdvanced = new AppServiceInfoAdvancedPanel<>(project, () -> FunctionAppConfig.builder().build());
88-
appServiceConfigPanelAdvanced.setValidRuntime(Runtime.FUNCTION_APP_RUNTIME);
88+
appServiceConfigPanelAdvanced.setValidRuntime(FunctionAppRuntime.getMajorRuntimes().stream().filter(r-> !r.isDocker()).collect(Collectors.toList()));
8989
appServiceConfigPanelAdvanced.setValidPricingTier(new ArrayList<>(PricingTier.FUNCTION_PRICING), PricingTier.CONSUMPTION);
9090
// Function does not support file deployment
9191
appServiceConfigPanelAdvanced.setDeploymentVisible(false);

0 commit comments

Comments
 (0)