Rerecord tests for Key Vault 7.3-preview (#22646)

Author: heaths

sdk/keyvault/Azure.Security.KeyVault.Administration/CHANGELOG.md

@@ -10,6 +10,7 @@
 
 ### Fixed
 
+- The default service version is now "7.3-preview".
 
 ## 4.0.0 (2021-06-15)
 

sdk/keyvault/Azure.Security.KeyVault.Administration/api/Azure.Security.KeyVault.Administration.netstandard2.0.cs

@@ -38,11 +38,12 @@ public KeyVaultAccessControlClient(System.Uri vaultUri, Azure.Core.TokenCredenti
     }
     public partial class KeyVaultAdministrationClientOptions : Azure.Core.ClientOptions
     {
-        public KeyVaultAdministrationClientOptions(Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion version = Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion.V7_2) { }
+        public KeyVaultAdministrationClientOptions(Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion version = Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion.V7_3_Preview) { }
         public Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion Version { get { throw null; } }
         public enum ServiceVersion
         {
             V7_2 = 1,
+            V7_3_Preview = 2,
         }
     }
     public static partial class KeyVaultAdministrationModelFactory

sdk/keyvault/Azure.Security.KeyVault.Administration/src/KeyVaultAdministrationClientOptions.cs

@@ -16,7 +16,7 @@ public class KeyVaultAdministrationClientOptions : ClientOptions
         /// For more information, see
         /// <see href="https://docs.microsoft.com/rest/api/keyvault/key-vault-versions">Key Vault versions</see>.
         /// </summary>
-        internal const ServiceVersion LatestVersion = ServiceVersion.V7_2;
+        internal const ServiceVersion LatestVersion = ServiceVersion.V7_3_Preview;
 
         /// <summary>
         /// The versions of Azure Key Vault supported by this client
@@ -29,6 +29,11 @@ public enum ServiceVersion
             /// The Key Vault API version 7.2.
             /// </summary>
             V7_2 = 1,
+
+            /// <summary>
+            /// The Key Vault API version 7.3-preview.
+            /// </summary>
+            V7_3_Preview = 2,
 #pragma warning restore CA1707 // Identifiers should not contain underscores
         }
 
@@ -59,7 +64,7 @@ internal string GetVersionString()
             return Version switch
             {
                 ServiceVersion.V7_2 => "7.2",
-
+                ServiceVersion.V7_3_Preview => "7.3-preview",
                 _ => throw new ArgumentException(Version.ToString()),
             };
         }

sdk/keyvault/Azure.Security.KeyVault.Administration/src/autorest.md

@@ -8,8 +8,8 @@ Run `dotnet build /t:GenerateCode` in src directory to re-generate.
 ``` yaml
 title: Azure.Security.KeyVault.Administration
 input-file:
-    - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1e2c9f3ec93078da8078389941531359e274f32a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.2/rbac.json
-    - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1e2c9f3ec93078da8078389941531359e274f32a/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.2/backuprestore.json
+    - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/f4a4badda9e19dca5cab216f3dd8b45362aeb90b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.2/rbac.json
+    - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/f4a4badda9e19dca5cab216f3dd8b45362aeb90b/specification/keyvault/data-plane/Microsoft.KeyVault/stable/7.2/backuprestore.json
 namespace: Azure.Security.KeyVault.Administration
 include-csproj: disable
 ```

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AccessControlClientLiveTests.cs

@@ -15,8 +15,8 @@ namespace Azure.Security.KeyVault.Administration.Tests
     [NonParallelizable]
     public class AccessControlClientLiveTests : AccessControlTestBase
     {
-        public AccessControlClientLiveTests(bool isAsync)
-            : base(isAsync, null /* RecordedTestMode.Record /* to re-record */)
+        public AccessControlClientLiveTests(bool isAsync, KeyVaultAdministrationClientOptions.ServiceVersion serviceVersion)
+            : base(isAsync, serviceVersion, null /* RecordedTestMode.Record /* to re-record */)
         { }
 
         [RecordedTest]

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AccessControlTestBase.cs

@@ -25,8 +25,8 @@ public abstract class AccessControlTestBase : AdministrationTestBase
         internal string _roleDefinitionId;
         internal string _objectId;
 
-        public AccessControlTestBase(bool isAsync, RecordedTestMode? mode)
-            : base(isAsync, mode)
+        public AccessControlTestBase(bool isAsync, KeyVaultAdministrationClientOptions.ServiceVersion serviceVersion, RecordedTestMode? mode)
+            : base(isAsync, serviceVersion, mode)
         { }
 
         internal KeyVaultAccessControlClient GetClient(TestRecording recording = null)

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/AdministrationTestBase.cs

@@ -15,15 +15,20 @@ namespace Azure.Security.KeyVault.Administration.Tests
     /// <summary>
     /// Base class for recorded Administration tests.
     /// </summary>
+    [ClientTestFixture(
+        KeyVaultAdministrationClientOptions.ServiceVersion.V7_2,
+        KeyVaultAdministrationClientOptions.ServiceVersion.V7_3_Preview)]
     public abstract class AdministrationTestBase : RecordedTestBase<KeyVaultTestEnvironment>
     {
         // Queue deletes, but poll on the top of the purge stack to increase likelihood of others being purged by then.
         private readonly ConcurrentQueue<string> _keysToDelete = new ConcurrentQueue<string>();
         private readonly ConcurrentStack<string> _keysToPurge = new ConcurrentStack<string>();
+        private readonly KeyVaultAdministrationClientOptions.ServiceVersion _serviceVersion;
 
-        protected AdministrationTestBase(bool isAsync, RecordedTestMode? mode)
+        protected AdministrationTestBase(bool isAsync, KeyVaultAdministrationClientOptions.ServiceVersion serviceVersion, RecordedTestMode? mode)
             : base(isAsync, mode)
         {
+            _serviceVersion = serviceVersion;
         }
 
         /// <summary>

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/BackupRestoreTestBase.cs

@@ -20,8 +20,8 @@ public abstract class BackupRestoreTestBase : AdministrationTestBase
         internal string BlobContainerName = "backup";
         internal string BlobContainerNameMultiPart = "backup/some/folder/name";
 
-        public BackupRestoreTestBase(bool isAsync, RecordedTestMode? mode)
-            : base(isAsync, mode)
+        public BackupRestoreTestBase(bool isAsync, KeyVaultAdministrationClientOptions.ServiceVersion serviceVersion, RecordedTestMode? mode)
+            : base(isAsync, serviceVersion, mode)
         {
             Sanitizer = new BackupRestoreRecordedTestSanitizer();
         }

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/FullBackupClientLiveTests.cs

@@ -5,15 +5,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core.TestFramework;
-using Azure.Security.KeyVault.Keys;
 using NUnit.Framework;
 
 namespace Azure.Security.KeyVault.Administration.Tests
 {
     public class FullBackupClientLiveTests : BackupRestoreTestBase
     {
-        public FullBackupClientLiveTests(bool isAsync)
-            : base(isAsync, null /* RecordedTestMode.Record /* to re-record */)
+        public FullBackupClientLiveTests(bool isAsync, KeyVaultAdministrationClientOptions.ServiceVersion serviceVersion)
+            : base(isAsync, serviceVersion, null /* RecordedTestMode.Record /* to re-record */)
         { }
 
         public TimeSpan Timeout => TimeSpan.FromMinutes(5);