Skip to content

Commit ca8a4c3

Browse files
author
SDKAuto
committed
CodeGen from PR 19767 in Azure/azure-rest-api-specs
Merge 59771d3124ba508e680667ac179274ebe89adcd0 into a9e895ccfe29d0646795f7ff1cb78e185bd09529
1 parent ff143a1 commit ca8a4c3

File tree

13 files changed

+511
-57
lines changed

13 files changed

+511
-57
lines changed

‎sdk/keyvault/arm-keyvault/CHANGELOG.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,44 @@
11
# Release History
22

3-
## 2.1.0-beta.1 (2022-04-24)
3+
## 3.0.0 (2022-07-15)
44

55
**Features**
66

7+
- Added operation ManagedHsms.checkMhsmNameAvailability
78
- Added Interface Action
9+
- Added Interface CheckMhsmNameAvailabilityParameters
10+
- Added Interface CheckMhsmNameAvailabilityResult
811
- Added Interface KeyReleasePolicy
912
- Added Interface KeyRotationPolicyAttributes
1013
- Added Interface LifetimeAction
14+
- Added Interface ManagedHsmsCheckMhsmNameAvailabilityOptionalParams
15+
- Added Interface ManagedHsmsCreateOrUpdateHeaders
16+
- Added Interface ManagedHsmsDeleteHeaders
17+
- Added Interface ManagedHSMSecurityDomainProperties
18+
- Added Interface ManagedHsmsPurgeDeletedHeaders
19+
- Added Interface ManagedHsmsUpdateHeaders
1120
- Added Interface RotationPolicy
1221
- Added Interface Trigger
22+
- Added Type Alias ActivationStatus
1323
- Added Type Alias KeyRotationPolicyActionType
24+
- Added Type Alias ManagedHsmsCheckMhsmNameAvailabilityResponse
25+
- Added Type Alias ManagedHsmsPurgeDeletedResponse
1426
- Interface KeyProperties has a new optional parameter releasePolicy
1527
- Interface KeyProperties has a new optional parameter rotationPolicy
28+
- Interface MhsmPrivateEndpointConnectionItem has a new optional parameter etag
29+
- Interface MhsmPrivateEndpointConnectionItem has a new optional parameter id
1630
- Type Alias Key has a new parameter rotationPolicy
1731
- Type Alias Key has a new parameter releasePolicy
32+
- Added Enum KnownActivationStatus
1833
- Enum KnownJsonWebKeyOperation has a new value Release
1934
- Enum KnownKeyPermissions has a new value Getrotationpolicy
2035
- Enum KnownKeyPermissions has a new value Release
2136
- Enum KnownKeyPermissions has a new value Rotate
2237
- Enum KnownKeyPermissions has a new value Setrotationpolicy
38+
39+
**Breaking Changes**
40+
41+
- Interface MhsmPrivateEndpointConnectionsDeleteHeaders no longer has parameter retryAfter
2342

2443

2544
## 2.0.0 (2022-01-17)

‎sdk/keyvault/arm-keyvault/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Azure management API provides a RESTful set of web services that interact wi
66

77
[Source code](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/keyvault/arm-keyvault) |
88
[Package (NPM)](https://www.npmjs.com/package/@azure/arm-keyvault) |
9-
[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-keyvault?view=azure-node-preview) |
9+
[API reference documentation](https://docs.microsoft.com/javascript/api/@azure/arm-keyvault) |
1010
[Samples](https://github.com/Azure-Samples/azure-samples-js-management)
1111

1212
## Getting started

‎sdk/keyvault/arm-keyvault/_meta.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"commit": "d90729bbada2b4f784f2737ab4b4e39693a7aab8",
3-
"readme": "specification\\keyvault\\resource-manager\\readme.md",
4-
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\work\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\keyvault\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220408.1 --generate-sample=true",
2+
"commit": "1c08462d46805748b66366252aff0ffc589b7d5f",
3+
"readme": "specification/keyvault/resource-manager/readme.md",
4+
"autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/keyvault/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.19.20220425.1",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
6-
"release_tool": "@azure-tools/js-sdk-release-tools@2.2.6",
7-
"use": "@autorest/typescript@6.0.0-alpha.19.20220408.1"
8-
}
6+
"release_tool": "@azure-tools/js-sdk-release-tools@2.4.0",
7+
"use": "@autorest/typescript@6.0.0-alpha.19.20220425.1"
8+
}

‎sdk/keyvault/arm-keyvault/package.json‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sdk-type": "mgmt",
44
"author": "Microsoft Corporation",
55
"description": "A generated SDK for KeyVaultManagementClient.",
6-
"version": "2.1.0-beta.1",
6+
"version": "3.0.0",
77
"engines": {
88
"node": ">=12.0.0"
99
},
@@ -40,9 +40,11 @@
4040
"uglify-js": "^3.4.9",
4141
"rimraf": "^3.0.0",
4242
"@azure/identity": "^2.0.1",
43-
"@azure-tools/test-recorder": "^1.0.0",
43+
"@azure-tools/test-recorder": "^2.0.0",
44+
"@azure-tools/test-credential": "^1.0.0",
4445
"mocha": "^7.1.1",
45-
"cross-env": "^7.0.2"
46+
"cross-env": "^7.0.2",
47+
"@azure/dev-tool": "^1.0.0"
4648
},
4749
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/keyvault/arm-keyvault",
4850
"repository": {
@@ -93,7 +95,7 @@
9395
"unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
9496
"unit-test:browser": "echo skipped",
9597
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
96-
"integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
98+
"integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
9799
"integration-test:browser": "echo skipped",
98100
"docs": "echo skipped"
99101
},
@@ -106,13 +108,5 @@
106108
}
107109
]
108110
},
109-
"autoPublish": true,
110-
"//sampleConfiguration": {
111-
"productName": "",
112-
"productSlugs": [
113-
"azure"
114-
],
115-
"disableDocsMs": true,
116-
"apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-keyvault?view=azure-node-preview"
117-
}
118-
}
111+
"autoPublish": true
112+
}

‎sdk/keyvault/arm-keyvault/review/arm-keyvault.api.md‎

Lines changed: 64 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ export interface Action {
2929
// @public
3030
export type ActionsRequired = string;
3131

32+
// @public
33+
export type ActivationStatus = string;
34+
3235
// @public
3336
export interface Attributes {
3437
readonly created?: Date;
@@ -41,6 +44,18 @@ export interface Attributes {
4144
// @public
4245
export type CertificatePermissions = string;
4346

47+
// @public
48+
export interface CheckMhsmNameAvailabilityParameters {
49+
name: string;
50+
}
51+
52+
// @public
53+
export interface CheckMhsmNameAvailabilityResult {
54+
readonly message?: string;
55+
readonly nameAvailable?: boolean;
56+
readonly reason?: Reason;
57+
}
58+
4459
// @public
4560
export interface CheckNameAvailabilityResult {
4661
readonly message?: string;
@@ -319,6 +334,14 @@ export enum KnownActionsRequired {
319334
None = "None"
320335
}
321336

337+
// @public
338+
export enum KnownActivationStatus {
339+
Active = "Active",
340+
Failed = "Failed",
341+
NotActivated = "NotActivated",
342+
Unknown = "Unknown"
343+
}
344+
322345
// @public
323346
export enum KnownCertificatePermissions {
324347
// (undocumented)
@@ -676,17 +699,30 @@ export interface ManagedHsms {
676699
beginCreateOrUpdateAndWait(resourceGroupName: string, name: string, parameters: ManagedHsm, options?: ManagedHsmsCreateOrUpdateOptionalParams): Promise<ManagedHsmsCreateOrUpdateResponse>;
677700
beginDelete(resourceGroupName: string, name: string, options?: ManagedHsmsDeleteOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
678701
beginDeleteAndWait(resourceGroupName: string, name: string, options?: ManagedHsmsDeleteOptionalParams): Promise<void>;
679-
beginPurgeDeleted(name: string, location: string, options?: ManagedHsmsPurgeDeletedOptionalParams): Promise<PollerLike<PollOperationState<void>, void>>;
680-
beginPurgeDeletedAndWait(name: string, location: string, options?: ManagedHsmsPurgeDeletedOptionalParams): Promise<void>;
702+
beginPurgeDeleted(name: string, location: string, options?: ManagedHsmsPurgeDeletedOptionalParams): Promise<PollerLike<PollOperationState<ManagedHsmsPurgeDeletedResponse>, ManagedHsmsPurgeDeletedResponse>>;
703+
beginPurgeDeletedAndWait(name: string, location: string, options?: ManagedHsmsPurgeDeletedOptionalParams): Promise<ManagedHsmsPurgeDeletedResponse>;
681704
beginUpdate(resourceGroupName: string, name: string, parameters: ManagedHsm, options?: ManagedHsmsUpdateOptionalParams): Promise<PollerLike<PollOperationState<ManagedHsmsUpdateResponse>, ManagedHsmsUpdateResponse>>;
682705
beginUpdateAndWait(resourceGroupName: string, name: string, parameters: ManagedHsm, options?: ManagedHsmsUpdateOptionalParams): Promise<ManagedHsmsUpdateResponse>;
706+
checkMhsmNameAvailability(mhsmName: CheckMhsmNameAvailabilityParameters, options?: ManagedHsmsCheckMhsmNameAvailabilityOptionalParams): Promise<ManagedHsmsCheckMhsmNameAvailabilityResponse>;
683707
get(resourceGroupName: string, name: string, options?: ManagedHsmsGetOptionalParams): Promise<ManagedHsmsGetResponse>;
684708
getDeleted(name: string, location: string, options?: ManagedHsmsGetDeletedOptionalParams): Promise<ManagedHsmsGetDeletedResponse>;
685709
listByResourceGroup(resourceGroupName: string, options?: ManagedHsmsListByResourceGroupOptionalParams): PagedAsyncIterableIterator<ManagedHsm>;
686710
listBySubscription(options?: ManagedHsmsListBySubscriptionOptionalParams): PagedAsyncIterableIterator<ManagedHsm>;
687711
listDeleted(options?: ManagedHsmsListDeletedOptionalParams): PagedAsyncIterableIterator<DeletedManagedHsm>;
688712
}
689713

714+
// @public
715+
export interface ManagedHsmsCheckMhsmNameAvailabilityOptionalParams extends coreClient.OperationOptions {
716+
}
717+
718+
// @public
719+
export type ManagedHsmsCheckMhsmNameAvailabilityResponse = CheckMhsmNameAvailabilityResult;
720+
721+
// @public
722+
export interface ManagedHsmsCreateOrUpdateHeaders {
723+
location?: string;
724+
}
725+
690726
// @public
691727
export interface ManagedHsmsCreateOrUpdateOptionalParams extends coreClient.OperationOptions {
692728
resumeFrom?: string;
@@ -696,12 +732,23 @@ export interface ManagedHsmsCreateOrUpdateOptionalParams extends coreClient.Oper
696732
// @public
697733
export type ManagedHsmsCreateOrUpdateResponse = ManagedHsm;
698734

735+
// @public
736+
export interface ManagedHsmsDeleteHeaders {
737+
location?: string;
738+
}
739+
699740
// @public
700741
export interface ManagedHsmsDeleteOptionalParams extends coreClient.OperationOptions {
701742
resumeFrom?: string;
702743
updateIntervalInMs?: number;
703744
}
704745

746+
// @public
747+
export interface ManagedHSMSecurityDomainProperties {
748+
readonly activationStatus?: ActivationStatus;
749+
readonly activationStatusMessage?: string;
750+
}
751+
705752
// @public
706753
export interface ManagedHsmsGetDeletedOptionalParams extends coreClient.OperationOptions {
707754
}
@@ -774,12 +821,25 @@ export interface ManagedHsmsListDeletedOptionalParams extends coreClient.Operati
774821
// @public
775822
export type ManagedHsmsListDeletedResponse = DeletedManagedHsmListResult;
776823

824+
// @public
825+
export interface ManagedHsmsPurgeDeletedHeaders {
826+
location?: string;
827+
}
828+
777829
// @public
778830
export interface ManagedHsmsPurgeDeletedOptionalParams extends coreClient.OperationOptions {
779831
resumeFrom?: string;
780832
updateIntervalInMs?: number;
781833
}
782834

835+
// @public
836+
export type ManagedHsmsPurgeDeletedResponse = ManagedHsmsPurgeDeletedHeaders;
837+
838+
// @public
839+
export interface ManagedHsmsUpdateHeaders {
840+
location?: string;
841+
}
842+
783843
// @public
784844
export interface ManagedHsmsUpdateOptionalParams extends coreClient.OperationOptions {
785845
resumeFrom?: string;
@@ -832,6 +892,8 @@ export type MhsmPrivateEndpointConnection = ManagedHsmResource & {
832892

833893
// @public
834894
export interface MhsmPrivateEndpointConnectionItem {
895+
etag?: string;
896+
id?: string;
835897
privateEndpoint?: MhsmPrivateEndpoint;
836898
privateLinkServiceConnectionState?: MhsmPrivateLinkServiceConnectionState;
837899
provisioningState?: PrivateEndpointConnectionProvisioningState;
@@ -849,7 +911,6 @@ export interface MhsmPrivateEndpointConnections {
849911
// @public
850912
export interface MhsmPrivateEndpointConnectionsDeleteHeaders {
851913
location?: string;
852-
retryAfter?: number;
853914
}
854915

855916
// @public

‎sdk/keyvault/arm-keyvault/src/keyVaultManagementClient.ts‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
import * as coreClient from "@azure/core-client";
1010
import * as coreRestPipeline from "@azure/core-rest-pipeline";
11+
import {
12+
PipelineRequest,
13+
PipelineResponse,
14+
SendRequest
15+
} from "@azure/core-rest-pipeline";
1116
import * as coreAuth from "@azure/core-auth";
1217
import {
1318
KeysImpl,
@@ -66,7 +71,7 @@ export class KeyVaultManagementClient extends coreClient.ServiceClient {
6671
credential: credentials
6772
};
6873

69-
const packageDetails = `azsdk-js-arm-keyvault/2.1.0-beta.1`;
74+
const packageDetails = `azsdk-js-arm-keyvault/3.0.0`;
7075
const userAgentPrefix =
7176
options.userAgentOptions && options.userAgentOptions.userAgentPrefix
7277
? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
@@ -113,7 +118,7 @@ export class KeyVaultManagementClient extends coreClient.ServiceClient {
113118

114119
// Assigning values to Constant parameters
115120
this.$host = options.$host || "https://management.azure.com";
116-
this.apiVersion = options.apiVersion || "2021-11-01-preview";
121+
this.apiVersion = options.apiVersion || "2022-07-01";
117122
this.keys = new KeysImpl(this);
118123
this.vaults = new VaultsImpl(this);
119124
this.privateEndpointConnections = new PrivateEndpointConnectionsImpl(this);
@@ -125,6 +130,35 @@ export class KeyVaultManagementClient extends coreClient.ServiceClient {
125130
this.mhsmPrivateLinkResources = new MhsmPrivateLinkResourcesImpl(this);
126131
this.operations = new OperationsImpl(this);
127132
this.secrets = new SecretsImpl(this);
133+
this.addCustomApiVersionPolicy(options.apiVersion);
134+
}
135+
136+
/** A function that adds a policy that sets the api-version (or equivalent) to reflect the library version. */
137+
private addCustomApiVersionPolicy(apiVersion?: string) {
138+
if (!apiVersion) {
139+
return;
140+
}
141+
const apiVersionPolicy = {
142+
name: "CustomApiVersionPolicy",
143+
async sendRequest(
144+
request: PipelineRequest,
145+
next: SendRequest
146+
): Promise<PipelineResponse> {
147+
const param = request.url.split("?");
148+
if (param.length > 1) {
149+
const newParams = param[1].split("&").map((item) => {
150+
if (item.indexOf("api-version") > -1) {
151+
return item.replace(/(?<==).*$/, apiVersion);
152+
} else {
153+
return item;
154+
}
155+
});
156+
request.url = param[0] + "?" + newParams.join("&");
157+
}
158+
return next(request);
159+
}
160+
};
161+
this.pipeline.addPolicy(apiVersionPolicy);
128162
}
129163

130164
keys: Keys;

0 commit comments

Comments
 (0)