Updated service version to 7.3 and re-recorded tests for Key Vault libraries (Azure#27953)

* Updated service version to 7.3 and re-recorded tests for Key Vault Administration.

* Updated service version to 7.3 and re-recorded tests for Key Vault Certificates.

* Updated service version to 7.3 and re-recorded tests for Key Vault Secrets.

* Updated service version to 7.3 and re-recorded tests for Key Vault Keys.

* Re-generated implementation layer of Key Vault Administration.

* Updated CHANGELOG files.

* Added specific commit for link in swagger autorest.md file

Co-authored-by: Maor Leger <[email protected]>

* Fixed issues with test recordings in Key Vault Administration.

* Fixed issues with test recordings in Key Vault Certificates. Refactored and reformatted test classes.

* Fixed issues with test recordings in Key Vault Keys. Refactored and reformatted test classes.

* Fixed issues with test recordings in Key Vault Secrets. Refactored and reformatted test classes.

* Fixed build issue.

* Fixed checkstyle issues.

* Fixed failing KV Admin test.

Co-authored-by: Maor Leger <[email protected]>

Author: vcolin7

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

@@ -3,6 +3,7 @@
 ## 4.1.0-beta.6 (Unreleased)
 
 ### Features Added
+- Added support for service version `7.3`
 
 ### Breaking Changes
 

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

@@ -15,9 +15,9 @@ public enum KeyVaultAdministrationServiceVersion implements ServiceVersion {
     V7_2("7.2"),
 
     /**
-     * Service version {@code 7.3-preview}.
+     * Service version {@code 7.3}.
      */
-    V7_3_PREVIEW("7.3-preview");
+    V7_3("7.3");
 
     private final String version;
 
@@ -36,6 +36,6 @@ public String getVersion() {
      * @return The latest {@link KeyVaultAdministrationServiceVersion}.
      */
     public static KeyVaultAdministrationServiceVersion getLatest() {
-        return V7_3_PREVIEW;
+        return V7_3;
     }
 }

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

@@ -4,11 +4,13 @@
 
 package com.azure.security.keyvault.administration.implementation;
 
+import com.azure.core.annotation.Generated;
 import com.azure.core.annotation.ServiceClientBuilder;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpHeaders;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddHeadersPolicy;
 import com.azure.core.http.policy.CookiePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
@@ -26,32 +28,35 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /** A builder for creating a new instance of the KeyVaultAccessControlClient type. */
 @ServiceClientBuilder(serviceClients = {KeyVaultAccessControlClientImpl.class})
 public final class KeyVaultAccessControlClientImplBuilder {
-    private static final String SDK_NAME = "name";
+    @Generated private static final String SDK_NAME = "name";
 
-    private static final String SDK_VERSION = "version";
+    @Generated private static final String SDK_VERSION = "version";
 
-    private final Map<String, String> properties = new HashMap<>();
+    @Generated private final Map<String, String> properties = new HashMap<>();
 
     /** Create an instance of the KeyVaultAccessControlClientImplBuilder. */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder() {
         this.pipelinePolicies = new ArrayList<>();
     }
 
     /*
      * Api Version
      */
-    private String apiVersion;
+    @Generated private String apiVersion;
 
     /**
      * Sets Api Version.
      *
      * @param apiVersion the apiVersion value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder apiVersion(String apiVersion) {
         this.apiVersion = apiVersion;
         return this;
@@ -60,14 +65,15 @@ public KeyVaultAccessControlClientImplBuilder apiVersion(String apiVersion) {
     /*
      * The HTTP pipeline to send requests through
      */
-    private HttpPipeline pipeline;
+    @Generated private HttpPipeline pipeline;
 
     /**
      * Sets The HTTP pipeline to send requests through.
      *
      * @param pipeline the pipeline value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder pipeline(HttpPipeline pipeline) {
         this.pipeline = pipeline;
         return this;
@@ -76,14 +82,15 @@ public KeyVaultAccessControlClientImplBuilder pipeline(HttpPipeline pipeline) {
     /*
      * The serializer to serialize an object into a string
      */
-    private SerializerAdapter serializerAdapter;
+    @Generated private SerializerAdapter serializerAdapter;
 
     /**
      * Sets The serializer to serialize an object into a string.
      *
      * @param serializerAdapter the serializerAdapter value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
         this.serializerAdapter = serializerAdapter;
         return this;
@@ -92,14 +99,15 @@ public KeyVaultAccessControlClientImplBuilder serializerAdapter(SerializerAdapte
     /*
      * The HTTP client used to send the request.
      */
-    private HttpClient httpClient;
+    @Generated private HttpClient httpClient;
 
     /**
      * Sets The HTTP client used to send the request.
      *
      * @param httpClient the httpClient value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder httpClient(HttpClient httpClient) {
         this.httpClient = httpClient;
         return this;
@@ -109,14 +117,15 @@ public KeyVaultAccessControlClientImplBuilder httpClient(HttpClient httpClient)
      * The configuration store that is used during construction of the service
      * client.
      */
-    private Configuration configuration;
+    @Generated private Configuration configuration;
 
     /**
      * Sets The configuration store that is used during construction of the service client.
      *
      * @param configuration the configuration value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder configuration(Configuration configuration) {
         this.configuration = configuration;
         return this;
@@ -125,14 +134,15 @@ public KeyVaultAccessControlClientImplBuilder configuration(Configuration config
     /*
      * The logging configuration for HTTP requests and responses.
      */
-    private HttpLogOptions httpLogOptions;
+    @Generated private HttpLogOptions httpLogOptions;
 
     /**
      * Sets The logging configuration for HTTP requests and responses.
      *
      * @param httpLogOptions the httpLogOptions value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
         this.httpLogOptions = httpLogOptions;
         return this;
@@ -142,14 +152,15 @@ public KeyVaultAccessControlClientImplBuilder httpLogOptions(HttpLogOptions http
      * The retry policy that will attempt to retry failed requests, if
      * applicable.
      */
-    private RetryPolicy retryPolicy;
+    @Generated private RetryPolicy retryPolicy;
 
     /**
      * Sets The retry policy that will attempt to retry failed requests, if applicable.
      *
      * @param retryPolicy the retryPolicy value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder retryPolicy(RetryPolicy retryPolicy) {
         this.retryPolicy = retryPolicy;
         return this;
@@ -158,20 +169,21 @@ public KeyVaultAccessControlClientImplBuilder retryPolicy(RetryPolicy retryPolic
     /*
      * The list of Http pipeline policies to add.
      */
-    private final List<HttpPipelinePolicy> pipelinePolicies;
+    @Generated private final List<HttpPipelinePolicy> pipelinePolicies;
 
     /*
      * The client options such as application ID and custom headers to set on a
      * request.
      */
-    private ClientOptions clientOptions;
+    @Generated private ClientOptions clientOptions;
 
     /**
      * Sets The client options such as application ID and custom headers to set on a request.
      *
      * @param clientOptions the clientOptions value.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder clientOptions(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
         return this;
@@ -183,6 +195,7 @@ public KeyVaultAccessControlClientImplBuilder clientOptions(ClientOptions client
      * @param customPolicy The custom Http pipeline policy to add.
      * @return the KeyVaultAccessControlClientImplBuilder.
      */
+    @Generated
     public KeyVaultAccessControlClientImplBuilder addPolicy(HttpPipelinePolicy customPolicy) {
         pipelinePolicies.add(customPolicy);
         return this;
@@ -193,9 +206,10 @@ public KeyVaultAccessControlClientImplBuilder addPolicy(HttpPipelinePolicy custo
      *
      * @return an instance of KeyVaultAccessControlClientImpl.
      */
+    @Generated
     public KeyVaultAccessControlClientImpl buildClient() {
         if (apiVersion == null) {
-            this.apiVersion = "7.3-preview";
+            this.apiVersion = "7.3";
         }
         if (pipeline == null) {
             this.pipeline = createHttpPipeline();
@@ -208,6 +222,7 @@ public KeyVaultAccessControlClientImpl buildClient() {
         return client;
     }
 
+    @Generated
     private HttpPipeline createHttpPipeline() {
         Configuration buildConfiguration =
                 (configuration == null) ? Configuration.getGlobalConfiguration() : configuration;
@@ -227,16 +242,24 @@ private HttpPipeline createHttpPipeline() {
         if (headers.getSize() > 0) {
             policies.add(new AddHeadersPolicy(headers));
         }
+        policies.addAll(
+                this.pipelinePolicies.stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                        .collect(Collectors.toList()));
         HttpPolicyProviders.addBeforeRetryPolicies(policies);
         policies.add(retryPolicy == null ? new RetryPolicy() : retryPolicy);
         policies.add(new CookiePolicy());
-        policies.addAll(this.pipelinePolicies);
+        policies.addAll(
+                this.pipelinePolicies.stream()
+                        .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                        .collect(Collectors.toList()));
         HttpPolicyProviders.addAfterRetryPolicies(policies);
         policies.add(new HttpLoggingPolicy(httpLogOptions));
         HttpPipeline httpPipeline =
                 new HttpPipelineBuilder()
                         .policies(policies.toArray(new HttpPipelinePolicy[0]))
                         .httpClient(httpClient)
+                        .clientOptions(clientOptions)
                         .build();
         return httpPipeline;
     }

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

@@ -179,7 +179,8 @@ Mono<SelectiveKeyRestoreOperationResponse> selectiveKeyRestoreOperation(
     }
 
     /**
-     * Creates a full backup using a user-provided SAS token to an Azure blob storage container.
+     * Creates a full backup using a user-provided SAS token to an Azure blob storage container. This operation is
+     * supported only by the Managed HSM service.
      *
      * @param vaultBaseUrl The vault name, for example https://myvault.vault.azure.net.
      * @param azureStorageBlobContainerUri Azure blob shared access signature token pointing to a valid Azure blob
@@ -189,7 +190,7 @@ Mono<SelectiveKeyRestoreOperationResponse> selectiveKeyRestoreOperation(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws KeyVaultErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return full backup operation.
+     * @return full backup operation on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<FullBackupResponse> fullBackupWithResponseAsync(
@@ -207,7 +208,7 @@ public Mono<FullBackupResponse> fullBackupWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws KeyVaultErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return full backup operation.
+     * @return full backup operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<FullBackupOperation>> fullBackupStatusWithResponseAsync(
@@ -226,7 +227,7 @@ public Mono<Response<FullBackupOperation>> fullBackupStatusWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws KeyVaultErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return restore operation.
+     * @return restore operation on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<FullRestoreOperationResponse> fullRestoreOperationWithResponseAsync(
@@ -244,7 +245,7 @@ public Mono<FullRestoreOperationResponse> fullRestoreOperationWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws KeyVaultErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return restore operation.
+     * @return restore operation along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<RestoreOperation>> restoreStatusWithResponseAsync(
@@ -265,7 +266,7 @@ public Mono<Response<RestoreOperation>> restoreStatusWithResponseAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws KeyVaultErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return selective Key Restore operation.
+     * @return selective Key Restore operation on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<SelectiveKeyRestoreOperationResponse> selectiveKeyRestoreOperationWithResponseAsync(