Skip to content

Commit a20949c

Browse files
authored
[Key Vault] Add support for service version 7.6-preview.2 and prepare library releases (Azure#44788)
* Updated commit hashes and re-generated libraries. * Updated convenience layer and samples for certificates. * Updated convenience layer for admin and secrets. * Updated code-generation and added more customizations. Also, added new getKeyAttestation*() methods to public clients. * Added codesnippets. * Fixed test resources deployment. * Removed partial-update for Keys. Updated customization accordingly. * Added KeyAttestation tests. * Updated tests to include preserveCertOrder. * Updated package-info customizations for Keys. * Removed partial-update for Certificates. Updated customization accordingly. * Removed partial-update for Secrets. Updated customization accordingly. * Updated Keys service versions. * Removed partial-update for Administration. Updated customization accordingly. * Fixed and re-recorded Admin tests. * Fixed and re-recorded Certs tests. * Fixed and re-recorded Keys tests. * Updated tags for test recordings. * Added a null check when dealing with KeyOperations for JsonWebKey in KeyVaultKeysModelsUtils * Fixed updateCertificatePolicyWithResponse(). * Added new key wrap algorithms and updated docs. * Fixed getKeyAttestation() tests. * Updated test recordings. * Updated CHANGELOGs and READMEs. * Fixed Spotless issues. * Removed unnecessary null check in KeyVaultKeysModelsUtils * Updated builders to pass the right arguments to UserAgentPolicy * Updated test recordings * Fixed CI issues. * Fixed more CI issues. * Updated TSP spec commit and re-generated libraries * Updated customizations for Keys and Certs to fix RevApi issues * Update release dates in CHANGELOG files
1 parent 1632db4 commit a20949c

File tree

108 files changed

+4093
-875
lines changed

Some content is hidden

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

108 files changed

+4093
-875
lines changed

sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# Release History
22

3-
## 4.7.0-beta.1 (Unreleased)
3+
## 4.7.0-beta.1 (2025-04-10)
44

55
### Features Added
6-
- Added support for pre-backup and pre-restore operations in `KeyVaultBackupClient` and `KeyVaultBackupAsyncClient`. These are long-running operations that check whether it is possible to perform a full key backup or a full key restore from a backup.
6+
- Added support for pre-backup and pre-restore operations in `KeyVaultBackupClient` and `KeyVaultBackupAsyncClient`. These are long-running operations that check whether it is possible to perform a full key backup or a full key restore from a backup. ([#39878](https://github.com/Azure/azure-sdk-for-java/pull/39878))
77

8-
### Breaking Changes
8+
### Other Changes
99

10-
### Bugs Fixed
10+
#### Dependency Updates
1111

12-
### Other Changes
12+
- Upgraded `azure-core` from `1.55.2` to version `1.55.3`.
13+
- Upgraded `azure-json` from `1.4.0` to version `1.5.0`.
14+
- Upgraded `azure-core-http-netty` from `1.15.10` to version `1.15.11`.
1315

1416
## 4.6.4 (2025-03-24)
1517

@@ -21,7 +23,6 @@
2123
- Upgraded `azure-core-http-netty` from `1.15.10` to version `1.15.11`.
2224
- Upgraded `azure-core` from `1.55.2` to version `1.55.3`.
2325

24-
2526
## 4.6.3 (2025-03-04)
2627

2728
### Other Changes

sdk/keyvault/azure-security-keyvault-administration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If you want to take dependency on a particular version of the library that is no
4343
<dependency>
4444
<groupId>com.azure</groupId>
4545
<artifactId>azure-security-keyvault-administration</artifactId>
46-
<version>4.7.0-beta.1</version>
46+
<version>4.7.0-beta.2</version>
4747
</dependency>
4848
```
4949
[//]: # ({x-version-update-end})

sdk/keyvault/azure-security-keyvault-administration/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/keyvault/azure-security-keyvault-administration",
5-
"Tag": "java/keyvault/azure-security-keyvault-administration_18fc6d4e27"
5+
"Tag": "java/keyvault/azure-security-keyvault-administration_2ccf326f57"
66
}

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultAccessControlClientBuilder.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,18 @@ public final class KeyVaultAccessControlClientBuilder
9797

9898
// This is the properties file name.
9999
private static final ClientLogger LOGGER = new ClientLogger(KeyVaultAccessControlClientBuilder.class);
100-
private static final String AZURE_KEY_VAULT_RBAC = "azure-security-keyvault-administration.properties";
101-
private static final String SDK_NAME = "name";
102-
private static final String SDK_VERSION = "version";
100+
private static final String CLIENT_NAME;
101+
private static final String CLIENT_VERSION;
102+
103+
static {
104+
Map<String, String> properties = CoreUtils.getProperties("azure-security-keyvault-administration.properties");
105+
CLIENT_NAME = properties.getOrDefault("name", "UnknownName");
106+
CLIENT_VERSION = properties.getOrDefault("version", "UnknownVersion");
107+
}
103108
private static final ClientOptions DEFAULT_CLIENT_OPTIONS = new ClientOptions();
104109

105110
private final List<HttpPipelinePolicy> perCallPolicies;
106111
private final List<HttpPipelinePolicy> perRetryPolicies;
107-
private final Map<String, String> properties;
108112

109113
// Please see <a href=https://docs.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers>here</a>
110114
// for more information on Azure resource provider namespaces.
@@ -130,7 +134,6 @@ public KeyVaultAccessControlClientBuilder() {
130134
httpLogOptions = new HttpLogOptions();
131135
perCallPolicies = new ArrayList<>();
132136
perRetryPolicies = new ArrayList<>();
133-
properties = CoreUtils.getProperties(AZURE_KEY_VAULT_RBAC);
134137
}
135138

136139
/**
@@ -208,15 +211,12 @@ private HttpPipeline getPipeline(Configuration buildConfiguration, ServiceVersio
208211
// Closest to API goes first, closest to wire goes last.
209212
final List<HttpPipelinePolicy> policies = new ArrayList<>();
210213

211-
String clientName = properties.getOrDefault(SDK_NAME, "UnknownName");
212-
String clientVersion = properties.getOrDefault(SDK_VERSION, "UnknownVersion");
213-
214214
httpLogOptions = (httpLogOptions == null) ? new HttpLogOptions() : httpLogOptions;
215215

216216
ClientOptions localClientOptions = clientOptions != null ? clientOptions : DEFAULT_CLIENT_OPTIONS;
217217

218-
policies.add(new UserAgentPolicy(CoreUtils.getApplicationId(localClientOptions, httpLogOptions), clientName,
219-
clientVersion, buildConfiguration));
218+
policies.add(new UserAgentPolicy(CoreUtils.getApplicationId(localClientOptions, httpLogOptions), CLIENT_NAME,
219+
CLIENT_VERSION, buildConfiguration));
220220

221221
List<HttpHeader> httpHeaderList = new ArrayList<>();
222222
localClientOptions.getHeaders()
@@ -240,7 +240,7 @@ private HttpPipeline getPipeline(Configuration buildConfiguration, ServiceVersio
240240

241241
TracingOptions tracingOptions = localClientOptions.getTracingOptions();
242242
Tracer tracer = TracerProvider.getDefaultProvider()
243-
.createTracer(clientName, clientVersion, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
243+
.createTracer(CLIENT_NAME, CLIENT_VERSION, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
244244

245245
return new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
246246
.httpClient(httpClient)

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultAdministrationServiceVersion.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public enum KeyVaultAdministrationServiceVersion implements ServiceVersion {
3030
V7_5("7.5"),
3131

3232
/**
33-
* Service version {@code 7.6-preview.1}.
33+
* Service version {@code 7.6-preview.2}.
3434
*/
35-
V7_6_PREVIEW_1("7.6-preview.1");
35+
V7_6_PREVIEW_2("7.6-preview.2");
3636

3737
private final String version;
3838

@@ -51,6 +51,6 @@ public String getVersion() {
5151
* @return The latest {@link KeyVaultAdministrationServiceVersion}.
5252
*/
5353
public static KeyVaultAdministrationServiceVersion getLatest() {
54-
return V7_6_PREVIEW_1;
54+
return V7_6_PREVIEW_2;
5555
}
5656
}

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultBackupClientBuilder.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,14 @@ public final class KeyVaultBackupClientBuilder implements TokenCredentialTrait<K
9393
HttpTrait<KeyVaultBackupClientBuilder>, ConfigurationTrait<KeyVaultBackupClientBuilder> {
9494
// This is the properties file name.
9595
private static final ClientLogger LOGGER = new ClientLogger(KeyVaultBackupClientBuilder.class);
96-
private static final String AZURE_KEY_VAULT_RBAC = "azure-security-keyvault-administration.properties";
97-
private static final String SDK_NAME = "name";
98-
private static final String SDK_VERSION = "version";
96+
private static final String CLIENT_NAME;
97+
private static final String CLIENT_VERSION;
98+
99+
static {
100+
Map<String, String> properties = CoreUtils.getProperties("azure-security-keyvault-administration.properties");
101+
CLIENT_NAME = properties.getOrDefault("name", "UnknownName");
102+
CLIENT_VERSION = properties.getOrDefault("version", "UnknownVersion");
103+
}
99104

100105
// Please see <a href=https://docs.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers>here</a>
101106
// for more information on Azure resource provider namespaces.
@@ -104,7 +109,6 @@ public final class KeyVaultBackupClientBuilder implements TokenCredentialTrait<K
104109

105110
private final List<HttpPipelinePolicy> perCallPolicies;
106111
private final List<HttpPipelinePolicy> perRetryPolicies;
107-
private final Map<String, String> properties;
108112

109113
private TokenCredential credential;
110114
private HttpPipeline pipeline;
@@ -126,7 +130,6 @@ public KeyVaultBackupClientBuilder() {
126130
httpLogOptions = new HttpLogOptions();
127131
perCallPolicies = new ArrayList<>();
128132
perRetryPolicies = new ArrayList<>();
129-
properties = CoreUtils.getProperties(AZURE_KEY_VAULT_RBAC);
130133
}
131134

132135
/**
@@ -199,15 +202,12 @@ private HttpPipeline getPipeline(Configuration buildConfiguration) {
199202
// Closest to API goes first, closest to wire goes last.
200203
final List<HttpPipelinePolicy> policies = new ArrayList<>();
201204

202-
String clientName = properties.getOrDefault(SDK_NAME, "UnknownName");
203-
String clientVersion = properties.getOrDefault(SDK_VERSION, "UnknownVersion");
204-
205205
httpLogOptions = (httpLogOptions == null) ? new HttpLogOptions() : httpLogOptions;
206206

207207
ClientOptions localClientOptions = clientOptions != null ? clientOptions : DEFAULT_CLIENT_OPTIONS;
208208

209-
policies.add(new UserAgentPolicy(CoreUtils.getApplicationId(localClientOptions, httpLogOptions), clientName,
210-
clientVersion, buildConfiguration));
209+
policies.add(new UserAgentPolicy(CoreUtils.getApplicationId(localClientOptions, httpLogOptions), CLIENT_NAME,
210+
CLIENT_VERSION, buildConfiguration));
211211

212212
List<HttpHeader> httpHeaderList = new ArrayList<>();
213213
localClientOptions.getHeaders()
@@ -231,7 +231,7 @@ private HttpPipeline getPipeline(Configuration buildConfiguration) {
231231

232232
TracingOptions tracingOptions = localClientOptions.getTracingOptions();
233233
Tracer tracer = TracerProvider.getDefaultProvider()
234-
.createTracer(clientName, clientVersion, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
234+
.createTracer(CLIENT_NAME, CLIENT_VERSION, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
235235

236236
return new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
237237
.httpClient(httpClient)

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultSettingsAsyncClient.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.azure.security.keyvault.administration.implementation.KeyVaultAdministrationUtils;
1616
import com.azure.security.keyvault.administration.implementation.models.Setting;
1717
import com.azure.security.keyvault.administration.implementation.models.SettingsListResult;
18+
import com.azure.security.keyvault.administration.implementation.models.UpdateSettingRequest;
1819
import com.azure.security.keyvault.administration.models.KeyVaultAdministrationException;
1920
import com.azure.security.keyvault.administration.models.KeyVaultGetSettingsResult;
2021
import com.azure.security.keyvault.administration.models.KeyVaultRoleDefinition;
@@ -197,7 +198,8 @@ public Mono<KeyVaultSetting> updateSetting(KeyVaultSetting setting) {
197198
}
198199

199200
return implClient
200-
.updateSettingWithResponseAsync(setting.getName(), BinaryData.fromObject(settingValue), EMPTY_OPTIONS)
201+
.updateSettingWithResponseAsync(setting.getName(),
202+
BinaryData.fromObject(new UpdateSettingRequest(settingValue)), EMPTY_OPTIONS)
201203
.onErrorMap(KeyVaultAdministrationUtils::mapThrowableToKeyVaultAdministrationException)
202204
.map(response -> transformToKeyVaultSetting(response.getValue().toObject(Setting.class)));
203205
} catch (RuntimeException e) {
@@ -242,7 +244,8 @@ public Mono<Response<KeyVaultSetting>> updateSettingWithResponse(KeyVaultSetting
242244
}
243245

244246
return implClient
245-
.updateSettingWithResponseAsync(setting.getName(), BinaryData.fromObject(settingValue), EMPTY_OPTIONS)
247+
.updateSettingWithResponseAsync(setting.getName(),
248+
BinaryData.fromObject(new UpdateSettingRequest(settingValue)), EMPTY_OPTIONS)
246249
.onErrorMap(KeyVaultAdministrationUtils::mapThrowableToKeyVaultAdministrationException)
247250
.map(response -> new SimpleResponse<>(response,
248251
transformToKeyVaultSetting(response.getValue().toObject(Setting.class))));

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultSettingsClient.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.azure.security.keyvault.administration.implementation.KeyVaultAdministrationClientImpl;
1616
import com.azure.security.keyvault.administration.implementation.models.Setting;
1717
import com.azure.security.keyvault.administration.implementation.models.SettingsListResult;
18+
import com.azure.security.keyvault.administration.implementation.models.UpdateSettingRequest;
1819
import com.azure.security.keyvault.administration.models.KeyVaultAdministrationException;
1920
import com.azure.security.keyvault.administration.models.KeyVaultGetSettingsResult;
2021
import com.azure.security.keyvault.administration.models.KeyVaultRoleDefinition;
@@ -181,7 +182,8 @@ public KeyVaultSetting updateSetting(KeyVaultSetting setting) {
181182
}
182183

183184
return KeyVaultSettingsAsyncClient.transformToKeyVaultSetting(implClient
184-
.updateSettingWithResponse(setting.getName(), BinaryData.fromObject(settingValue), EMPTY_OPTIONS)
185+
.updateSettingWithResponse(setting.getName(),
186+
BinaryData.fromObject(new UpdateSettingRequest(settingValue)), EMPTY_OPTIONS)
185187
.getValue()
186188
.toObject(Setting.class));
187189
} catch (RuntimeException e) {
@@ -227,7 +229,8 @@ public Response<KeyVaultSetting> updateSettingWithResponse(KeyVaultSetting setti
227229
}
228230

229231
Response<BinaryData> response = implClient.updateSettingWithResponse(setting.getName(),
230-
BinaryData.fromObject(settingValue), new RequestOptions().setContext(context));
232+
BinaryData.fromObject(new UpdateSettingRequest(settingValue)),
233+
new RequestOptions().setContext(context));
231234

232235
return new SimpleResponse<>(response,
233236
KeyVaultSettingsAsyncClient.transformToKeyVaultSetting(response.getValue().toObject(Setting.class)));

sdk/keyvault/azure-security-keyvault-administration/src/main/java/com/azure/security/keyvault/administration/KeyVaultSettingsClientBuilder.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,21 @@ public final class KeyVaultSettingsClientBuilder implements TokenCredentialTrait
9898
HttpTrait<KeyVaultSettingsClientBuilder>, ConfigurationTrait<KeyVaultSettingsClientBuilder> {
9999

100100
private static final ClientLogger LOGGER = new ClientLogger(KeyVaultSettingsClientBuilder.class);
101-
private static final String AZURE_KEY_VAULT_RBAC = "azure-security-keyvault-administration.properties";
102-
private static final String SDK_NAME = "name";
103-
private static final String SDK_VERSION = "version";
101+
private static final String CLIENT_NAME;
102+
private static final String CLIENT_VERSION;
103+
104+
static {
105+
Map<String, String> properties = CoreUtils.getProperties("azure-security-keyvault-administration.properties");
106+
CLIENT_NAME = properties.getOrDefault("name", "UnknownName");
107+
CLIENT_VERSION = properties.getOrDefault("version", "UnknownVersion");
108+
}
104109

105110
// Please see <a href=https://docs.microsoft.com/azure/azure-resource-manager/management/azure-services-resource-providers>here</a>
106111
// for more information on Azure resource provider namespaces.
107112
private static final String KEYVAULT_TRACING_NAMESPACE_VALUE = "Microsoft.KeyVault";
108113
private static final ClientOptions DEFAULT_CLIENT_OPTIONS = new ClientOptions();
109114

110115
private final List<HttpPipelinePolicy> pipelinePolicies;
111-
private final Map<String, String> properties;
112116

113117
private TokenCredential credential;
114118
private HttpPipeline pipeline;
@@ -128,7 +132,6 @@ public final class KeyVaultSettingsClientBuilder implements TokenCredentialTrait
128132
public KeyVaultSettingsClientBuilder() {
129133
this.httpLogOptions = new HttpLogOptions();
130134
this.pipelinePolicies = new ArrayList<>();
131-
this.properties = CoreUtils.getProperties(AZURE_KEY_VAULT_RBAC);
132135
}
133136

134137
/**
@@ -420,16 +423,12 @@ private HttpPipeline createHttpPipeline() {
420423

421424
final List<HttpPipelinePolicy> policies = new ArrayList<>();
422425

423-
String clientName = properties.getOrDefault(SDK_NAME, "UnknownName");
424-
String clientVersion = properties.getOrDefault(SDK_VERSION, "UnknownVersion");
425-
426426
httpLogOptions = (httpLogOptions == null) ? new HttpLogOptions() : httpLogOptions;
427427

428428
ClientOptions localClientOptions = clientOptions != null ? clientOptions : DEFAULT_CLIENT_OPTIONS;
429429

430-
String applicationId = CoreUtils.getApplicationId(localClientOptions, httpLogOptions);
431-
432-
policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration));
430+
policies.add(new UserAgentPolicy(CoreUtils.getApplicationId(localClientOptions, httpLogOptions), CLIENT_NAME,
431+
CLIENT_VERSION, buildConfiguration));
433432
policies.add(new RequestIdPolicy());
434433
policies.add(new AddHeadersFromContextPolicy());
435434

@@ -457,7 +456,7 @@ private HttpPipeline createHttpPipeline() {
457456

458457
TracingOptions tracingOptions = localClientOptions.getTracingOptions();
459458
Tracer tracer = TracerProvider.getDefaultProvider()
460-
.createTracer(clientName, clientVersion, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
459+
.createTracer(CLIENT_NAME, CLIENT_VERSION, KEYVAULT_TRACING_NAMESPACE_VALUE, tracingOptions);
461460

462461
return new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
463462
.httpClient(httpClient)

0 commit comments

Comments
 (0)