Skip to content

Commit

Permalink
Add support for Key Vault 7.5-preview.1 (#38377)
Browse files Browse the repository at this point in the history
* Add support for Key Vault 7.5-preview.1

Also treats KeyRotationPolicyAction as case-insensitive.

* Update public APIs

* Use latest commit

Resolves #38729
  • Loading branch information
heaths authored and hallipr committed Oct 2, 2023
1 parent edeb5d2 commit 15aa7e7
Show file tree
Hide file tree
Showing 40 changed files with 185 additions and 56 deletions.
7 changes: 0 additions & 7 deletions eng/common/scripts/TypeSpec-Project-Generate.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ function NpmInstallForProject([string]$workingDirectory) {
Copy-Item -Path $emitterPackageLock -Destination "package-lock.json" -Force
}

$useAlphaNpmRegistry = (Get-Content $replacementPackageJson -Raw).Contains("-alpha.")

if($useAlphaNpmRegistry) {
Write-Host "Package.json contains '-alpha.' in the version, Creating .npmrc using public/azure-sdk-for-js-test-autorest feed."
"registry=https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest@local/npm/registry/ `n`nalways-auth=true" | Out-File '.npmrc'
}

if ($usingLockFile) {
Invoke-LoggedCommand "npm ci"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Features Added

- TODO: sasToken vs. useManagedIdentity.

### Breaking Changes

### Bugs Fixed
Expand All @@ -12,6 +14,8 @@

### Other Changes

- The default service version is now "7.5-preview.1".

## 4.3.0 (2023-03-14)

### Breaking Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ 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_4) { }
public KeyVaultAdministrationClientOptions(Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion version = Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion.V7_5_Preview_1) { }
public bool DisableChallengeResourceVerification { get { throw null; } set { } }
public Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions.ServiceVersion Version { get { throw null; } }
public enum ServiceVersion
{
V7_2 = 1,
V7_3 = 2,
V7_4 = 3,
V7_5_Preview_1 = 4,
}
}
public static partial class KeyVaultAdministrationModelFactory
Expand All @@ -76,12 +77,12 @@ protected KeyVaultBackupClient() { }
public KeyVaultBackupClient(System.Uri vaultUri, Azure.Core.TokenCredential credential) { }
public KeyVaultBackupClient(System.Uri vaultUri, Azure.Core.TokenCredential credential, Azure.Security.KeyVault.Administration.KeyVaultAdministrationClientOptions options) { }
public virtual System.Uri VaultUri { get { throw null; } }
public virtual Azure.Security.KeyVault.Administration.KeyVaultBackupOperation StartBackup(System.Uri blobStorageUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultBackupOperation> StartBackupAsync(System.Uri blobStorageUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Security.KeyVault.Administration.KeyVaultRestoreOperation StartRestore(System.Uri folderUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultRestoreOperation> StartRestoreAsync(System.Uri folderUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Security.KeyVault.Administration.KeyVaultSelectiveKeyRestoreOperation StartSelectiveKeyRestore(string keyName, System.Uri folderUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultSelectiveKeyRestoreOperation> StartSelectiveKeyRestoreAsync(string keyName, System.Uri folderUri, string sasToken, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Security.KeyVault.Administration.KeyVaultBackupOperation StartBackup(System.Uri blobStorageUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultBackupOperation> StartBackupAsync(System.Uri blobStorageUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Security.KeyVault.Administration.KeyVaultRestoreOperation StartRestore(System.Uri folderUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultRestoreOperation> StartRestoreAsync(System.Uri folderUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual Azure.Security.KeyVault.Administration.KeyVaultSelectiveKeyRestoreOperation StartSelectiveKeyRestore(string keyName, System.Uri folderUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
public virtual System.Threading.Tasks.Task<Azure.Security.KeyVault.Administration.KeyVaultSelectiveKeyRestoreOperation> StartSelectiveKeyRestoreAsync(string keyName, System.Uri folderUri, string sasToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
}
public partial class KeyVaultBackupOperation : Azure.Operation<Azure.Security.KeyVault.Administration.KeyVaultBackupResult>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"AssetsRepo": "Azure/azure-sdk-assets",
"AssetsRepoPrefixPath": "net",
"TagPrefix": "net/keyvault/Azure.Security.KeyVault.Administration",
"Tag": "net/keyvault/Azure.Security.KeyVault.Administration_92615e7932"
"Tag": "net/keyvault/Azure.Security.KeyVault.Administration_ecca1d12cb"
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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_4;
internal const ServiceVersion LatestVersion = ServiceVersion.V7_5_Preview_1;

/// <summary>
/// The versions of Azure Key Vault supported by this client
Expand All @@ -39,6 +39,11 @@ public enum ServiceVersion
/// The Key Vault API version 7.4.
/// </summary>
V7_4 = 3,

/// <summary>
/// The Key Vault API version 7.5-preview.1.
/// </summary>
V7_5_Preview_1 = 4,
#pragma warning restore CA1707 // Identifiers should not contain underscores
}

Expand Down Expand Up @@ -75,6 +80,7 @@ internal string GetVersionString()
ServiceVersion.V7_2 => "7.2",
ServiceVersion.V7_3 => "7.3",
ServiceVersion.V7_4 => "7.4",
ServiceVersion.V7_5_Preview_1 => "7.5-preview.1",
_ => throw new ArgumentException(Version.ToString()),
};
}
Expand Down
Loading

0 comments on commit 15aa7e7

Please sign in to comment.