Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

Commit d2bed9b

Browse files
[Storage] updated to 2017-06-01; Supported keyvault keys.
1 parent d995c63 commit d2bed9b

15 files changed

+847
-58
lines changed

Tools/NuGet.exe

2.79 MB
Binary file not shown.

gulpfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ const mappings = {
337337
'storage': {
338338
'packageName': 'azure-arm-storage',
339339
'dir': 'storageManagement2/lib',
340-
'source': 'arm-storage/2016-12-01/swagger/storage.json',
340+
'source': 'arm-storage/2017-06-01/swagger/storage.json',
341341
'ft': 2,
342342
'clientName': 'StorageManagementClient'
343343
},
@@ -362,7 +362,7 @@ const mappings = {
362362
}
363363
};
364364

365-
const defaultAutoRestVersion = '1.0.1-20170430-2300-nightly';
365+
const defaultAutoRestVersion = '1.0.1-20170608-2300-nightly';
366366
var usingAutoRestVersion;
367367
const specRoot = args['spec-root'] || "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master";
368368
const project = args['project'];

lib/services/storageManagement2/lib/models/encryption.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,20 @@ const models = require('./index');
6464
* when encryption is enabled. There might be some unencrypted blobs which were
6565
* written after this time, as it is just a rough estimate.
6666
*
67+
* @member {string} keySource The encryption keySource (provider). Possible
68+
* values (case-insensitive): Microsoft.Storage, Microsoft.Keyvault. Possible
69+
* values include: 'Microsoft.Storage', 'Microsoft.Keyvault'. Default value:
70+
* 'Microsoft.Storage' .
71+
*
72+
* @member {object} [keyVaultProperties] Properties provided by key vault.
73+
*
74+
* @member {string} [keyVaultProperties.keyName] The name of KeyVault key.
75+
*
76+
* @member {string} [keyVaultProperties.keyVersion] The version of KeyVault
77+
* key.
78+
*
79+
* @member {string} [keyVaultProperties.keyVaultUri] The Uri of KeyVault.
80+
*
6781
*/
6882
class Encryption {
6983
constructor() {
@@ -93,12 +107,19 @@ class Encryption {
93107
},
94108
keySource: {
95109
required: true,
96-
isConstant: true,
97110
serializedName: 'keySource',
98111
defaultValue: 'Microsoft.Storage',
99112
type: {
100113
name: 'String'
101114
}
115+
},
116+
keyVaultProperties: {
117+
required: false,
118+
serializedName: 'keyvaultproperties',
119+
type: {
120+
name: 'Composite',
121+
className: 'KeyVaultProperties'
122+
}
102123
}
103124
}
104125
}

0 commit comments

Comments
 (0)