Skip to content

Commit fa7b44b

Browse files
authored
Define custom platform for HSM tests (Azure#17925)
Resolves Azure#16483
1 parent 7db5b3b commit fa7b44b

File tree

436 files changed

+27201
-43818
lines changed

Some content is hidden

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

436 files changed

+27201
-43818
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public KeyVaultAccessControlClient(System.Uri vaultUri, Azure.Core.TokenCredenti
4747
}
4848
public partial class KeyVaultAdministrationClientOptions : Azure.Core.ClientOptions
4949
{
50-
public KeyVaultAdministrationClientOptions(Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion version = Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion.V7_2_Preview) { }
50+
public KeyVaultAdministrationClientOptions(Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion version = Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion.V7_2) { }
5151
public Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion Version { get { throw null; } }
5252
public enum ServiceVersion
5353
{
54-
V7_2_Preview = 1,
54+
V7_2 = 1,
5555
}
5656
}
5757
public static partial class KeyVaultAdministrationModelFactory

sdk/keyvault/Azure.Security.KeyVault.Administration/samples/Sample1_BackupHelloWorldAsync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BackupOperation backupOperation = await Client.StartBackupAsync(builder.Uri, sas
3838
// Wait for completion of the BackupOperation.
3939
Response<BackupResult> backupResult = await backupOperation.WaitForCompletionAsync();
4040

41-
// Get the Uri for the location of you backup blob.
41+
// Get the Uri for the location of your backup blob.
4242
Uri folderUri = backupResult.Value.FolderUri;
4343
```
4444

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class KeyVaultAdministrationClientOptions : ClientOptions
1616
/// For more information, see
1717
/// <see href="https://docs.microsoft.com/rest/api/keyvault/key-vault-versions">Key Vault versions</see>.
1818
/// </summary>
19-
internal const ServiceVersion LatestVersion = ServiceVersion.V7_2_Preview;
19+
internal const ServiceVersion LatestVersion = ServiceVersion.V7_2;
2020

2121
/// <summary>
2222
/// The versions of Azure Key Vault supported by this client
@@ -26,9 +26,9 @@ public enum ServiceVersion
2626
{
2727
#pragma warning disable CA1707 // Identifiers should not contain underscores
2828
/// <summary>
29-
/// The Key Vault API version 7.2-preview.
29+
/// The Key Vault API version 7.2.
3030
/// </summary>
31-
V7_2_Preview = 1,
31+
V7_2 = 1,
3232
#pragma warning restore CA1707 // Identifiers should not contain underscores
3333
}
3434

@@ -58,7 +58,7 @@ internal string GetVersionString()
5858
{
5959
return Version switch
6060
{
61-
ServiceVersion.V7_2_Preview => "7.2-preview",
61+
ServiceVersion.V7_2 => "7.2",
6262

6363
_ => throw new ArgumentException(Version.ToString()),
6464
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Run `dotnet build /t:GenerateCode` in src directory to re-generate.
88
``` yaml
99
title: Azure.Security.KeyVault.Administration
1010
input-file:
11-
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/a094846a5f9ee9e8a3cf3f3c809203e250798b22/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/rbac.json
12-
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/a094846a5f9ee9e8a3cf3f3c809203e250798b22/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/backuprestore.json
11+
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/612f78afd05911d0e1e82ba72b41781f655dbffb/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/rbac.json
12+
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/612f78afd05911d0e1e82ba72b41781f655dbffb/specification/keyvault/data-plane/Microsoft.KeyVault/preview/7.2-preview/backuprestore.json
1313
namespace: Azure.Security.KeyVault.Administration
1414
include-csproj: disable
1515
```

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ public FullBackupClientLiveTests(bool isAsync)
1616
: base(isAsync, null /* RecordedTestMode.Record /* to re-record */)
1717
{ }
1818

19+
public TimeSpan Timeout => TimeSpan.FromMinutes(5);
20+
1921
[RecordedTest]
2022
public async Task BackupAndRestore()
2123
{
22-
var source = new CancellationTokenSource(TimeSpan.FromMinutes(2));
24+
var source = new CancellationTokenSource(Timeout);
2325

2426
UriBuilder builder = new UriBuilder(TestEnvironment.StorageUri);
2527
builder.Path = BlobContainerName;
@@ -53,7 +55,7 @@ public async Task BackupAndRestore()
5355
[LiveOnly]
5456
public async Task BackupAndRestoreMultiPartFolderName()
5557
{
56-
var source = new CancellationTokenSource(TimeSpan.FromMinutes(2));
58+
var source = new CancellationTokenSource(Timeout);
5759

5860
UriBuilder builder = new UriBuilder(TestEnvironment.StorageUri);
5961
builder.Path = BlobContainerNameMultiPart;

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/SessionRecords/AccessControlClientLiveTests/CreateOrUpdateRoleDefinition.json

Lines changed: 39 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/keyvault/Azure.Security.KeyVault.Administration/tests/SessionRecords/AccessControlClientLiveTests/CreateOrUpdateRoleDefinitionAsync.json

Lines changed: 39 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)