Skip to content

Commit

Permalink
CodeGen from PR 13585 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Dev keyvault microsoft.key vault 2021 04 01 preview (Azure#13585)

* Adds base for updating Microsoft.KeyVault from version preview/2020-04-01-preview to version 2021-04-01-preview

* Updates readme

* Updates API version in new specs and examples

* Open API change for Managed Hsm private endpoints feature (Azure#12938)

* Open API change for Managed Hsm private endpoints feature

* Fixing spell check errors

* Fixing spell check errors

* Prettier fixes

* Fixing swagger validation errors

* Fixing systemData property reference

* Adding publicNetworkAccess property based on private endpoint requirement.

* GET responses following a successful DELETE should be returning 404. … (Azure#13054)

* GET responses following a successful DELETE should be returning 404. Only the DELETE response is to return 204 if the resource didn't exist (it allows idempotent deletes).

(cherry picked from commit b752a19c6cc1f8a8eed9f106e2c77b8d5b5db19f)

* Removing 404 as it is taken care by default response.

* Added new routes for Deleted ManagedHsm for Soft Delete Feature (Azure#13282)

* Added new routes for Deleted ManagedHsm and examples, updated ManagedHsm definition to include PurgeDateTimeUTC

* Fixing validation issues.

* Fixing errors in properties in example jsons

* Delete keyvault.json

Deleted an errant json file

* Fixed misspelling of property in examples

* Fixed x-ms-examples naming, fixed camelcasing

* Addressing comments in PR to make 204s 404s and also changing PurgeDateTimeUTC to scheduledPurgeDate

* Added schema definitions for 404

* Removed 200 for purge

Co-authored-by: Soohwan Kim <sookim@microsoft.com>

* Addressing Comments for PR 13585 (Azure#13586)

* Removed 404s to allow requests to fall through to default

* Removing 404s from examples

Co-authored-by: Soohwan Kim <sookim@microsoft.com>

* Added deletedmanagedhsm object to examples and managedhsm.json (Azure#13591)

* Added deletedmanagedhsm object to examples and managedhsm.json

* Fixing error in references to correct values

* Changed vaultId to mhsmId in exmaples

Co-authored-by: Soohwan Kim <sookim@microsoft.com>

* Try to use the common type for SystemData (Azure#13723)

* Add SystemData property for KeyVault

* 04012021 fix schema (Azure#13749)

* Resolving conflict with custom-words.txt

* Add 2021 preview to azureresourcechema, add suppression to readme

* Add 2021 preview to azureresourcechema

* Merging custom-words.txt

Co-authored-by: Soohwan Kim <sookim@microsoft.com>

* Add missing default error response (Azure#13762)

* Fix Lint error (Azure#13765)

* Add missing default error response

* Update the integer format to fix Lint error

* Add securityDefinitions

* Added python tag for 2021 preview (Azure#13805)

Co-authored-by: Soohwan Kim <sookim@microsoft.com>

* Fixing linting errors for MHSM R4036 - ImplementPrivateEndpointAPIs (Azure#13822)

* Fixing linting errors for MHSM R4036 - ImplementPrivateEndpointAPIs

(cherry picked from commit c1c5aebfb98cacd0a4ee5596fb7b0d9f782a9a3e)

* prettier fix

* Add suppression for SystemData (Azure#13835)

* Add suppression for SystemData

* Fix linting error R4036 - ImplementPrivateEndpointAPIs

* specify the suppression for SystemData

* Revert "specify the suppression for SystemData"

This reverts commit cbebab81ab08ec1a29b41c891c58cf08ff2eb3c4.

Co-authored-by: jiacheng-L <71623842+jiacheng-L@users.noreply.github.com>
Co-authored-by: kim-soohwan <40476315+kim-soohwan@users.noreply.github.com>
Co-authored-by: Soohwan Kim <sookim@microsoft.com>
Co-authored-by: Arthur Ning <57385816+akning-ms@users.noreply.github.com>
  • Loading branch information
5 people committed Apr 8, 2021
1 parent 0bbe943 commit 30077ff
Show file tree
Hide file tree
Showing 27 changed files with 5,668 additions and 322 deletions.
2 changes: 1 addition & 1 deletion sdk/keyvault/arm-keyvault/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2021 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 7 additions & 8 deletions sdk/keyvault/arm-keyvault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ npm install @azure/arm-keyvault

### How to use

#### nodejs - Authentication, client creation and get vaults as an example written in TypeScript.
#### nodejs - client creation and get vaults as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
```bash
npm install @azure/ms-rest-nodeauth
npm install @azure/ms-rest-nodeauth@"^3.0.0"
```

##### Sample code

While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { KeyVaultManagementClient, KeyVaultManagementModels, KeyVaultManagementMappers } from "@azure/arm-keyvault";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { KeyVaultManagementClient } = require("@azure/arm-keyvault");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down Expand Up @@ -99,5 +99,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fkeyvault%2Farm-keyvault%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/keyvault/arm-keyvault/README.png)
20 changes: 10 additions & 10 deletions sdk/keyvault/arm-keyvault/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "KeyVaultManagementClient Library with typescript type definitions for node.js and browser.",
"version": "1.2.1",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.3.2",
"@azure/ms-rest-js": "^1.8.1",
"tslib": "^1.9.3"
"@azure/ms-rest-azure-js": "^2.0.1",
"@azure/ms-rest-js": "^2.0.4",
"tslib": "^1.10.0"
},
"keywords": [
"node",
Expand All @@ -20,19 +20,19 @@
"module": "./esm/keyVaultManagementClient.js",
"types": "./esm/keyVaultManagementClient.d.ts",
"devDependencies": {
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"typescript": "^3.5.3",
"rollup": "^1.18.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.4.9"
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/azure/azure-sdk-for-js",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/keyvault/arm-keyvault",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
"url": "https://github.com/Azure/azure-sdk-for-js.git"
},
"bugs": {
"url": "https://github.com/azure/azure-sdk-for-js/issues"
"url": "https://github.com/Azure/azure-sdk-for-js/issues"
},
"files": [
"dist/**/*.js",
Expand Down
6 changes: 3 additions & 3 deletions sdk/keyvault/arm-keyvault/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [
nodeResolve({ module: true }),
nodeResolve({ mainFields: ['module', 'main'] }),
sourcemaps()
]
};
Expand Down
17 changes: 14 additions & 3 deletions sdk/keyvault/arm-keyvault/src/keyVaultManagementClient.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand All @@ -18,7 +17,13 @@ import { KeyVaultManagementClientContext } from "./keyVaultManagementClientConte
class KeyVaultManagementClient extends KeyVaultManagementClientContext {
// Operation groups
vaults: operations.Vaults;
privateEndpointConnections: operations.PrivateEndpointConnections;
privateLinkResources: operations.PrivateLinkResources;
managedHsms: operations.ManagedHsms;
mHSMPrivateEndpointConnections: operations.MHSMPrivateEndpointConnections;
mHSMPrivateLinkResources: operations.MHSMPrivateLinkResources;
operations: operations.Operations;
secrets: operations.Secrets;

/**
* Initializes a new instance of the KeyVaultManagementClient class.
Expand All @@ -30,7 +35,13 @@ class KeyVaultManagementClient extends KeyVaultManagementClientContext {
constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.KeyVaultManagementClientOptions) {
super(credentials, subscriptionId, options);
this.vaults = new operations.Vaults(this);
this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
this.privateLinkResources = new operations.PrivateLinkResources(this);
this.managedHsms = new operations.ManagedHsms(this);
this.mHSMPrivateEndpointConnections = new operations.MHSMPrivateEndpointConnections(this);
this.mHSMPrivateLinkResources = new operations.MHSMPrivateLinkResources(this);
this.operations = new operations.Operations(this);
this.secrets = new operations.Secrets(this);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
Expand Down Expand Up @@ -45,7 +44,7 @@ export class KeyVaultManagementClientContext extends msRestAzure.AzureServiceCli

super(credentials, options);

this.apiVersion = '2018-02-14';
this.apiVersion = '2021-04-01-preview';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Loading

0 comments on commit 30077ff

Please sign in to comment.