Skip to content

Commit 3626886

Browse files
authored
mgmt, appservice functionapp on ACA fix, prepare release (Azure#38154)
* test * implementation * assets.json * version_client.txt * pom.xml * readme.md * changelog.md * single_service_packages.md
1 parent 8103e9a commit 3626886

File tree

81 files changed

+299
-287
lines changed

Some content is hidden

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

81 files changed

+299
-287
lines changed

eng/versioning/version_client.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -249,32 +249,32 @@ com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;4.14.0;4.15.0-beta.1
249249
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;4.14.0;4.15.0-beta.1
250250
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;4.14.0;4.15.0-beta.1
251251
com.azure.spring:spring-cloud-azure-trace-sleuth;4.14.0;4.15.0-beta.1
252-
com.azure.resourcemanager:azure-resourcemanager;2.33.0;2.34.0-beta.1
253-
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.33.0;2.34.0-beta.1
254-
com.azure.resourcemanager:azure-resourcemanager-appservice;2.33.0;2.34.0-beta.1
255-
com.azure.resourcemanager:azure-resourcemanager-authorization;2.33.0;2.34.0-beta.1
256-
com.azure.resourcemanager:azure-resourcemanager-cdn;2.33.0;2.34.0-beta.1
257-
com.azure.resourcemanager:azure-resourcemanager-compute;2.33.0;2.34.0-beta.1
258-
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.33.0;2.34.0-beta.1
259-
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.33.0;2.34.0-beta.1
260-
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.33.0;2.34.0-beta.1
261-
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.33.0;2.34.0-beta.1
262-
com.azure.resourcemanager:azure-resourcemanager-dns;2.33.0;2.34.0-beta.1
263-
com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.33.0;2.34.0-beta.1
264-
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.33.0;2.34.0-beta.1
265-
com.azure.resourcemanager:azure-resourcemanager-monitor;2.33.0;2.34.0-beta.1
266-
com.azure.resourcemanager:azure-resourcemanager-msi;2.33.0;2.34.0-beta.1
267-
com.azure.resourcemanager:azure-resourcemanager-network;2.33.0;2.34.0-beta.1
252+
com.azure.resourcemanager:azure-resourcemanager;2.33.0;2.34.0
253+
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.33.0;2.34.0
254+
com.azure.resourcemanager:azure-resourcemanager-appservice;2.33.0;2.34.0
255+
com.azure.resourcemanager:azure-resourcemanager-authorization;2.33.0;2.34.0
256+
com.azure.resourcemanager:azure-resourcemanager-cdn;2.33.0;2.34.0
257+
com.azure.resourcemanager:azure-resourcemanager-compute;2.33.0;2.34.0
258+
com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.33.0;2.34.0
259+
com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.33.0;2.34.0
260+
com.azure.resourcemanager:azure-resourcemanager-containerservice;2.33.0;2.34.0
261+
com.azure.resourcemanager:azure-resourcemanager-cosmos;2.33.0;2.34.0
262+
com.azure.resourcemanager:azure-resourcemanager-dns;2.33.0;2.34.0
263+
com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.33.0;2.34.0
264+
com.azure.resourcemanager:azure-resourcemanager-keyvault;2.33.0;2.34.0
265+
com.azure.resourcemanager:azure-resourcemanager-monitor;2.33.0;2.34.0
266+
com.azure.resourcemanager:azure-resourcemanager-msi;2.33.0;2.34.0
267+
com.azure.resourcemanager:azure-resourcemanager-network;2.33.0;2.34.0
268268
com.azure.resourcemanager:azure-resourcemanager-perf;1.0.0-beta.1;1.0.0-beta.1
269-
com.azure.resourcemanager:azure-resourcemanager-privatedns;2.33.0;2.34.0-beta.1
270-
com.azure.resourcemanager:azure-resourcemanager-resources;2.33.0;2.34.0-beta.1
271-
com.azure.resourcemanager:azure-resourcemanager-redis;2.33.0;2.34.0-beta.1
269+
com.azure.resourcemanager:azure-resourcemanager-privatedns;2.33.0;2.34.0
270+
com.azure.resourcemanager:azure-resourcemanager-resources;2.33.0;2.34.0
271+
com.azure.resourcemanager:azure-resourcemanager-redis;2.33.0;2.34.0
272272
com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.1;2.0.0-beta.1
273-
com.azure.resourcemanager:azure-resourcemanager-search;2.33.0;2.34.0-beta.1
274-
com.azure.resourcemanager:azure-resourcemanager-servicebus;2.33.0;2.34.0-beta.1
275-
com.azure.resourcemanager:azure-resourcemanager-sql;2.33.0;2.34.0-beta.1
276-
com.azure.resourcemanager:azure-resourcemanager-storage;2.33.0;2.34.0-beta.1
277-
com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.33.0;2.34.0-beta.1
273+
com.azure.resourcemanager:azure-resourcemanager-search;2.33.0;2.34.0
274+
com.azure.resourcemanager:azure-resourcemanager-servicebus;2.33.0;2.34.0
275+
com.azure.resourcemanager:azure-resourcemanager-sql;2.33.0;2.34.0
276+
com.azure.resourcemanager:azure-resourcemanager-storage;2.33.0;2.34.0
277+
com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.33.0;2.34.0
278278
com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.1;2.0.0-beta.1
279279
com.azure.resourcemanager:azure-resourcemanager-mediaservices;2.3.0;2.4.0-beta.2
280280
com.azure.resourcemanager:azure-resourcemanager-mysql;1.0.2;1.1.0-beta.1

sdk/resourcemanager/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ For your convenience, we have provided a multi-service package that includes som
3838
<dependency>
3939
<groupId>com.azure.resourcemanager</groupId>
4040
<artifactId>azure-resourcemanager</artifactId>
41-
<version>2.33.0</version>
41+
<version>2.34.0</version>
4242
</dependency>
4343
```
4444
[//]: # ({x-version-update-end})
@@ -100,7 +100,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
100100
<dependency>
101101
<groupId>com.azure</groupId>
102102
<artifactId>azure-identity</artifactId>
103-
<version>1.11.0</version>
103+
<version>1.11.1</version>
104104
</dependency>
105105
```
106106
[//]: # ({x-version-update-end})
@@ -112,7 +112,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
112112
<dependency>
113113
<groupId>com.azure</groupId>
114114
<artifactId>azure-core-http-netty</artifactId>
115-
<version>1.13.10</version>
115+
<version>1.13.11</version>
116116
</dependency>
117117
```
118118
[//]: # ({x-version-update-end})
@@ -303,7 +303,7 @@ For example, here is sample maven dependency for Compute package.
303303
<dependency>
304304
<groupId>com.azure.resourcemanager</groupId>
305305
<artifactId>azure-resourcemanager-compute</artifactId>
306-
<version>2.33.0</version>
306+
<version>2.34.0</version>
307307
</dependency>
308308
```
309309
[//]: # ({x-version-update-end})

sdk/resourcemanager/azure-resourcemanager-appplatform/CHANGELOG.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
# Release History
22

3-
## 2.34.0-beta.1 (Unreleased)
3+
## 2.34.0 (2023-12-22)
44

5-
### Features Added
6-
7-
### Breaking Changes
5+
### Other Changes
86

9-
### Bugs Fixed
7+
#### Dependency Updates
108

11-
### Other Changes
9+
- Updated core dependency from resources.
1210

1311
## 2.33.0 (2023-11-24)
1412

sdk/resourcemanager/azure-resourcemanager-appplatform/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
1818
<dependency>
1919
<groupId>com.azure.resourcemanager</groupId>
2020
<artifactId>azure-resourcemanager-appplatform</artifactId>
21-
<version>2.33.0</version>
21+
<version>2.34.0</version>
2222
</dependency>
2323
```
2424
[//]: # ({x-version-update-end})

sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>com.azure.resourcemanager</groupId>
1616
<artifactId>azure-resourcemanager-appplatform</artifactId>
17-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
17+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appplatform;current} -->
1818
<packaging>jar</packaging>
1919

2020
<name>Microsoft Azure SDK for App Platform Management</name>
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.azure.resourcemanager</groupId>
6464
<artifactId>azure-resourcemanager-resources</artifactId>
65-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
65+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
6666
</dependency>
6767
<dependency>
6868
<groupId>com.azure</groupId>
@@ -108,19 +108,19 @@
108108
<dependency>
109109
<groupId>com.azure.resourcemanager</groupId>
110110
<artifactId>azure-resourcemanager-keyvault</artifactId>
111-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
111+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
112112
<scope>test</scope>
113113
</dependency>
114114
<dependency>
115115
<groupId>com.azure.resourcemanager</groupId>
116116
<artifactId>azure-resourcemanager-dns</artifactId>
117-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
117+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>
121121
<groupId>com.azure.resourcemanager</groupId>
122122
<artifactId>azure-resourcemanager-appservice</artifactId>
123-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
123+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>

sdk/resourcemanager/azure-resourcemanager-appservice/CHANGELOG.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
# Release History
22

3-
## 2.34.0-beta.1 (Unreleased)
3+
## 2.34.0 (2023-12-22)
44

55
### Features Added
66

77
- Supported Function App in Azure Container Apps environment.
88
- Supported `withManagedEnvironmentId` for `FunctionApp`.
99
- Supported `withMaxReplica` and `withMinReplica` for `FunctionApp`.
1010

11-
### Breaking Changes
12-
13-
### Bugs Fixed
14-
15-
### Other Changes
16-
1711
## 2.33.0 (2023-11-24)
1812

1913
### Bugs Fixed

sdk/resourcemanager/azure-resourcemanager-appservice/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
1818
<dependency>
1919
<groupId>com.azure.resourcemanager</groupId>
2020
<artifactId>azure-resourcemanager-appservice</artifactId>
21-
<version>2.33.0</version>
21+
<version>2.34.0</version>
2222
</dependency>
2323
```
2424
[//]: # ({x-version-update-end})

sdk/resourcemanager/azure-resourcemanager-appservice/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "java",
44
"TagPrefix": "java/resourcemanager/azure-resourcemanager-appservice",
5-
"Tag": "java/resourcemanager/azure-resourcemanager-appservice_2e8daf983d"
5+
"Tag": "java/resourcemanager/azure-resourcemanager-appservice_9c589b3b57"
66
}

sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>com.azure.resourcemanager</groupId>
1616
<artifactId>azure-resourcemanager-appservice</artifactId>
17-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
17+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-appservice;current} -->
1818
<packaging>jar</packaging>
1919

2020
<name>Microsoft Azure SDK for App Service Management</name>
@@ -65,27 +65,27 @@
6565
<dependency>
6666
<groupId>com.azure.resourcemanager</groupId>
6767
<artifactId>azure-resourcemanager-resources</artifactId>
68-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
68+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;current} -->
6969
</dependency>
7070
<dependency>
7171
<groupId>com.azure.resourcemanager</groupId>
7272
<artifactId>azure-resourcemanager-storage</artifactId>
73-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
73+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
7474
</dependency>
7575
<dependency>
7676
<groupId>com.azure.resourcemanager</groupId>
7777
<artifactId>azure-resourcemanager-msi</artifactId>
78-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
78+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-msi;current} -->
7979
</dependency>
8080
<dependency>
8181
<groupId>com.azure.resourcemanager</groupId>
8282
<artifactId>azure-resourcemanager-keyvault</artifactId>
83-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
83+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;current} -->
8484
</dependency>
8585
<dependency>
8686
<groupId>com.azure.resourcemanager</groupId>
8787
<artifactId>azure-resourcemanager-dns</artifactId>
88-
<version>2.34.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
88+
<version>2.34.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dns;current} -->
8989
</dependency>
9090
<dependency>
9191
<groupId>org.junit.jupiter</groupId>

sdk/resourcemanager/azure-resourcemanager-appservice/src/main/java/com/azure/resourcemanager/appservice/implementation/FunctionAppImpl.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.azure.resourcemanager.appservice.fluent.models.SiteLogsConfigInner;
3232
import com.azure.resourcemanager.appservice.fluent.models.SitePatchResourceInner;
3333
import com.azure.resourcemanager.appservice.models.AppServicePlan;
34+
import com.azure.resourcemanager.appservice.models.AppSetting;
3435
import com.azure.resourcemanager.appservice.models.FunctionApp;
3536
import com.azure.resourcemanager.appservice.models.FunctionAuthenticationPolicy;
3637
import com.azure.resourcemanager.appservice.models.FunctionDeploymentSlots;
@@ -62,6 +63,7 @@
6263
import java.util.HashMap;
6364
import java.util.List;
6465
import java.util.Map;
66+
import java.util.stream.Collectors;
6567

6668
/** The implementation for FunctionApp. */
6769
class FunctionAppImpl
@@ -698,6 +700,31 @@ public FunctionAppImpl withMinReplicas(int minReplicas) {
698700
return this;
699701
}
700702

703+
@Override
704+
public Mono<Map<String, AppSetting>> getAppSettingsAsync() {
705+
if (isFunctionAppOnACA()) {
706+
// current function app on ACA doesn't support deployment slot, so appSettings sticky is false
707+
return listAppSettings()
708+
.map(
709+
appSettingsInner ->
710+
appSettingsInner
711+
.properties()
712+
.entrySet()
713+
.stream()
714+
.collect(
715+
Collectors
716+
.toMap(
717+
Map.Entry::getKey,
718+
entry ->
719+
new AppSettingImpl(
720+
entry.getKey(),
721+
entry.getValue(),
722+
false))));
723+
} else {
724+
return super.getAppSettingsAsync();
725+
}
726+
}
727+
701728
/**
702729
* Whether this Function App is on Azure Container Apps environment.
703730
*

0 commit comments

Comments
 (0)