Merge pull request #2466 from microsoft/prepare-endgame-202406

Prepare endgame 202406
microsoft · Jun 24, 2024 · 5c3751b · 5c3751b
2 parents 1ff27fe + fceb7f9
commit 5c3751b
Show file tree

Hide file tree

Showing 37 changed files with 77 additions and 66 deletions.
diff --git a/azure-appservice-maven-plugin-lib/pom.xml b/azure-appservice-maven-plugin-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-maven-plugins</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-appservice-maven-plugin-lib</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  <properties>
  <maven.compiler.source>8</maven.compiler.source>
  <maven.compiler.target>8</maven.compiler.target>

diff --git a/azure-functions-maven-plugin/CHANGELOG.md b/azure-functions-maven-plugin/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log
 All notable changes to the "Maven Plugin for Azure Function" will be documented in this file.
 - [Change Log](#change-log)
+ - [1.36.0](#1360)
  - [1.35.0](#1350)
  - [1.31.0](#1310)
  - [1.30.0](#1300)
@@ -28,6 +29,9 @@ All notable changes to the "Maven Plugin for Azure Function" will be documented
  - [1.2.1](#121)
  - [1.2.0](#120)
 
+## 1.36.0
+- Add support for Workload profiles Azure Container Apps environment
+
 ## 1.35.0
 - Add Flex Consumption SKU support for creation and deploying
 - Added Azure Blob Storage Trigger (using Event Grid) templates for flex consumption apps

diff --git a/azure-functions-maven-plugin/pom.xml b/azure-functions-maven-plugin/pom.xml
@@ -6,12 +6,12 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugins</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-functions-maven-plugin</artifactId>
- <version>1.36.0-SNAPSHOT</version>
+ <version>1.36.0</version>
  <packaging>maven-plugin</packaging>
  <name>Maven Plugin for Azure Functions</name>
  <description>Maven Plugin for Azure Functions</description>

diff --git a/...e-functions-maven-plugin/src/main/java/com/microsoft/azure/maven/function/DeployMojo.java b/...e-functions-maven-plugin/src/main/java/com/microsoft/azure/maven/function/DeployMojo.java
@@ -274,6 +274,13 @@ private void validateContainerHostFunctionConfiguration() {
  if (StringUtils.isBlank(this.cpu) && StringUtils.isNoneBlank(this.memory)) {
  throw new AzureToolkitRuntimeException("The <cpu> argument is required with <memory>. Please provide both or none.");
  }
+ if (StringUtils.isNoneBlank(this.cpu)) {
+ try {
+ Double.valueOf(this.cpu);
+ } catch (final NumberFormatException nfe) {
+ throw new AzureToolkitRuntimeException("The value of <cpu> is not valid. Please provide a correct value. e.g. 2.0.");
+ }
+ }
  if (StringUtils.isNotBlank(this.memory)) {
  if (!StringUtils.endsWithIgnoreCase(this.memory, "gi")) {
  throw new AzureToolkitRuntimeException("The value of <memory> should end with Gi. Please provide a correct value. e.g. 4.0Gi.");

diff --git a/azure-maven-plugin-lib/pom.xml b/azure-maven-plugin-lib/pom.xml
@@ -7,12 +7,12 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugins</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugin-lib</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  <name>Azure Maven Plugin Library</name>
  <description>Common library for Azure Maven Plugins</description>
  <url>https://github.com/microsoft/azure-maven-plugins</url>

diff --git a/azure-sdk-build-tool/pom.xml b/azure-sdk-build-tool/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugins</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>

diff --git a/azure-sfmesh-maven-plugin/pom.xml b/azure-sfmesh-maven-plugin/pom.xml
@@ -8,7 +8,7 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugins</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>

diff --git a/azure-spring-apps-maven-plugin/pom.xml b/azure-spring-apps-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-maven-plugins</artifactId>
- <version>1.39.0-SNAPSHOT</version>
+ <version>1.39.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-applicationinsights-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-applicationinsights-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-applicationinsights-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-appservice-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-appservice-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-appservice-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
  <dependency>

diff --git a/azure-toolkit-libs/azure-toolkit-auth-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-auth-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-auth-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>com.azure</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-cognitiveservices-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-cognitiveservices-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-libs</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-cognitiveservices-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>

diff --git a/azure-toolkit-libs/azure-toolkit-common-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-common-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-common-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
  <dependency>

diff --git a/.../test/java/com/microsoft/azure/toolkit/lib/common/telemetry/AzureTelemetryClientTest.java b/.../test/java/com/microsoft/azure/toolkit/lib/common/telemetry/AzureTelemetryClientTest.java
@@ -21,7 +21,7 @@ public void anonymizePersonallyIdentifiableInformation() {
  put("fake-slack-token", "xoxp-FAKE"); // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="fake credential for test case")]
  put("fake-path", "/Users/username/.AzureToolkitforIntelliJ/extensions");
  put("fake-github-token", "ghp_000000000000000000000000000000000000"); // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="fake credential for test case")]
- put("fake-cli-credential", "login.exe -adminpassword FAKE"); // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="fake credential for test case")]
+ put("fake-cli-credential", "login.exe -adminp FAKE"); // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="fake credential for test case")]
  }};
  AzureTelemetryClientTest.anonymizePersonallyIdentifiableInformation(map);
  assert StringUtils.equals(map.get("fake-password"), "<REDACTED: Generic Secret>");

diff --git a/azure-toolkit-libs/azure-toolkit-compute-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-compute-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-compute-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
  <dependency>

diff --git a/azure-toolkit-libs/azure-toolkit-containerapps-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-containerapps-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-containerapps-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-containerregistry-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-containerregistry-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-containerregistry-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-containerservice-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-containerservice-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-containerservice-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>

diff --git a/azure-toolkit-libs/azure-toolkit-cosmos-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-cosmos-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-cosmos-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>

diff --git a/azure-toolkit-libs/azure-toolkit-database-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-database-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-database-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
 

diff --git a/azure-toolkit-libs/azure-toolkit-eventhubs-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-eventhubs-lib/pom.xml
@@ -6,12 +6,12 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-libs</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-eventhubs-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-keyvault-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-keyvault-lib/pom.xml
@@ -6,12 +6,12 @@
  <parent>
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-libs</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-keyvault-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-monitor-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-monitor-lib/pom.xml
@@ -4,13 +4,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-monitor-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  <dependencies>
  <dependency>
  <groupId>org.projectlombok</groupId>

diff --git a/azure-toolkit-libs/azure-toolkit-mysql-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-mysql-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-mysql-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
 

diff --git a/azure-toolkit-libs/azure-toolkit-mysql-single-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-mysql-single-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-mysql-single-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
 

diff --git a/azure-toolkit-libs/azure-toolkit-postgre-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-postgre-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-postgre-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>
 

diff --git a/azure-toolkit-libs/azure-toolkit-postgre-single-lib/pom.xml b/azure-toolkit-libs/azure-toolkit-postgre-single-lib/pom.xml
@@ -5,13 +5,13 @@
  <parent>
  <artifactId>azure-toolkit-libs</artifactId>
  <groupId>com.microsoft.azure</groupId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 
  <groupId>com.microsoft.azure</groupId>
  <artifactId>azure-toolkit-postgre-single-lib</artifactId>
- <version>0.46.0-SNAPSHOT</version>
+ <version>0.46.0</version>
 
  <dependencies>