From 0eae57bd86de5251f6ebc53001d44f84a20cef70 Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Wed, 11 Dec 2019 15:09:54 -0800 Subject: [PATCH 1/7] Workspace: Swagger updates for CMK --- .../stable/2020-01-01/examples/createWorkspace.json | 12 +++++++++--- .../stable/2020-01-01/examples/getWorkspace.json | 4 +++- .../stable/2020-01-01/machineLearningServices.json | 9 +++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json index bce63cc088ef..d002df458ac0 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json @@ -16,7 +16,9 @@ "containerRegistry": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ContainerRegistry/registries/testRegistry", "keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", "applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights", - "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount" + "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "hbiWorkspace": false } } }, @@ -39,7 +41,9 @@ "discoveryUrl": "http://example.com", "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", - "description": "test description" + "description": "test description", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "hbiWorkspace": false } } }, @@ -61,7 +65,9 @@ "discoveryUrl": "http://example.com", "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", - "description": "test description" + "description": "test description", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "hbiWorkspace": false } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json index e0ac1ae81768..c08d53c7e117 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json @@ -24,7 +24,9 @@ "discoveryUrl": "http://example.com", "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", - "description": "test description" + "description": "test description", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "hbiWorkspace": false } } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index a418da411ec0..e41dbe3869fb 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -1452,6 +1452,15 @@ }, "readOnly": true, "description": "The current deployment state of workspace resource. The provisioningState is to indicate states for resource provisioning." + }, + "resourceCmkUri": { + "description": "The keyUri of the customer managed key to encrypt the data at rest.", + "type": "string" + }, + "hbiWorkspace": { + "type": "boolean", + "description": "The flag to signal HBI data in the workspace and reduce diagnostic data collected by the service", + "default": false } } }, From 7937fb64479c0480f77d4de1c91acf9e655efdf6 Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Thu, 12 Dec 2019 15:49:50 -0800 Subject: [PATCH 2/7] PR comments --- .../stable/2020-01-01/examples/createWorkspace.json | 6 +++--- .../stable/2020-01-01/examples/getWorkspace.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json index d002df458ac0..0c624afb742e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json @@ -17,7 +17,7 @@ "keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", "applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights", "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", "hbiWorkspace": false } } @@ -42,7 +42,7 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", "hbiWorkspace": false } } @@ -66,7 +66,7 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", "hbiWorkspace": false } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json index c08d53c7e117..b9378cc3c0d2 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json @@ -25,7 +25,7 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey", + "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", "hbiWorkspace": false } } From 045a8412573690d22151387af2c0ca02699cf6b6 Mon Sep 17 00:00:00 2001 From: Vrushali Gangal Date: Tue, 17 Dec 2019 11:51:31 -0800 Subject: [PATCH 3/7] PR comments fixes PR comments fixes --- .../2020-01-01/examples/createWorkspace.json | 24 +++++++++-- .../2020-01-01/examples/getWorkspace.json | 8 +++- .../2020-01-01/machineLearningServices.json | 42 +++++++++++++++++-- 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json index 0c624afb742e..e1fba891db85 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json @@ -17,7 +17,13 @@ "keyVault": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", "applicationInsights": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/microsoft.insights/components/testinsights", "storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "encryption": { + "status": "Enabled", + "keyVaultProperties": { + "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "identityClientId": "" + } + }, "hbiWorkspace": false } } @@ -42,7 +48,13 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "encryption": { + "status": "Enabled", + "keyVaultProperties": { + "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "identityClientId": "" + } + }, "hbiWorkspace": false } } @@ -66,7 +78,13 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "encryption": { + "status": "Enabled", + "keyVaultProperties": { + "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "identityClientId": "" + } + }, "hbiWorkspace": false } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json index b9378cc3c0d2..1b98c0a71bb9 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json @@ -25,7 +25,13 @@ "creationTime": "2017-03-01T23:14:37.0707808Z", "friendlyName": "HelloName", "description": "test description", - "resourceCmkUri": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "encryption": { + "status": "Enabled", + "keyVaultProperties": { + "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "identityClientId": "" + } + }, "hbiWorkspace": false } } diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index e41dbe3869fb..089240774b0f 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -1453,9 +1453,9 @@ "readOnly": true, "description": "The current deployment state of workspace resource. The provisioningState is to indicate states for resource provisioning." }, - "resourceCmkUri": { - "description": "The keyUri of the customer managed key to encrypt the data at rest.", - "type": "string" + "encryption": { + "$ref": "#/definitions/EncryptionProperty", + "description": "The encryption settings of Azure ML workspace." }, "hbiWorkspace": { "type": "boolean", @@ -3191,6 +3191,40 @@ } }, "description": "Properties of a private link resource." - } + }, + "EncryptionProperty": { + "type": "object", + "properties": { + "status": { + "description": "Indicates whether or not the encryption is enabled for the workspace.", + "enum": [ + "Enabled", + "Disabled" + ], + "type": "string", + "x-ms-enum": { + "name": "EncryptionStatus", + "modelAsString": true + } + }, + "keyVaultProperties": { + "$ref": "#/definitions/KeyVaultProperties", + "description": "Customer Key vault properties." + } + } + }, + "KeyVaultProperties": { + "type": "object", + "properties": { + "keyIdentifier": { + "description": "Key vault uri to access the encryption key.", + "type": "string" + }, + "identityClientId": { + "description": "For future use - The client id of the identity which will be used to access key vault.", + "type": "string" + } + } + } } } From c10e1404612c764df5a27a0b3c048ded98fda4ea Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Wed, 18 Dec 2019 12:02:44 -0800 Subject: [PATCH 4/7] marked as required --- .../stable/2020-01-01/machineLearningServices.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index 089240774b0f..39a25ee3fe47 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -3194,6 +3194,9 @@ }, "EncryptionProperty": { "type": "object", + "required": [ + "keyVaultProperties" + ], "properties": { "status": { "description": "Indicates whether or not the encryption is enabled for the workspace.", @@ -3214,7 +3217,10 @@ } }, "KeyVaultProperties": { - "type": "object", + "type": "object", + "required": [ + "keyIdentifier" + ], "properties": { "keyIdentifier": { "description": "Key vault uri to access the encryption key.", From 4b236870061b238472e75acab1534c5428c89d32 Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Wed, 18 Dec 2019 12:06:23 -0800 Subject: [PATCH 5/7] marked as required --- .../2020-01-01/machineLearningServices.json | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index 39a25ee3fe47..4126630e004e 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -3193,10 +3193,6 @@ "description": "Properties of a private link resource." }, "EncryptionProperty": { - "type": "object", - "required": [ - "keyVaultProperties" - ], "properties": { "status": { "description": "Indicates whether or not the encryption is enabled for the workspace.", @@ -3214,23 +3210,27 @@ "$ref": "#/definitions/KeyVaultProperties", "description": "Customer Key vault properties." } - } + }, + "required": [ + "keyVaultProperties" + ], + "type": "object" }, "KeyVaultProperties": { - "type": "object", + "properties": { + "keyIdentifier": { + "description": "Key vault uri to access the encryption key.", + "type": "string" + }, + "identityClientId": { + "description": "For future use - The client id of the identity which will be used to access key vault.", + "type": "string" + } + }, "required": [ "keyIdentifier" ], - "properties": { - "keyIdentifier": { - "description": "Key vault uri to access the encryption key.", - "type": "string" - }, - "identityClientId": { - "description": "For future use - The client id of the identity which will be used to access key vault.", - "type": "string" - } - } - } + "type": "object" + } } } From 97109eaf883bb6263a3bb73b075ad64f5b10e703 Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Sat, 21 Dec 2019 09:12:39 -0800 Subject: [PATCH 6/7] added KeyVault armId to encryption.keyVaultProperties --- .../stable/2020-01-01/examples/createWorkspace.json | 9 ++++++--- .../stable/2020-01-01/examples/getWorkspace.json | 3 ++- .../stable/2020-01-01/machineLearningServices.json | 7 ++++++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json index e1fba891db85..dc3e25f56c28 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json @@ -20,7 +20,8 @@ "encryption": { "status": "Enabled", "keyVaultProperties": { - "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", + "keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb", "identityClientId": "" } }, @@ -51,7 +52,8 @@ "encryption": { "status": "Enabled", "keyVaultProperties": { - "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", + "keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb", "identityClientId": "" } }, @@ -81,7 +83,8 @@ "encryption": { "status": "Enabled", "keyVaultProperties": { - "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", + "keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb", "identityClientId": "" } }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json index 1b98c0a71bb9..6cb4b63cac77 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json @@ -28,7 +28,8 @@ "encryption": { "status": "Enabled", "keyVaultProperties": { - "keyIdentifier": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv/keys/testkey/aabbccddee112233445566778899aabb", + "keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv", + "keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb", "identityClientId": "" } }, diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index 4126630e004e..0351b0e23906 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -3218,6 +3218,10 @@ }, "KeyVaultProperties": { "properties": { + "keyVaultArmId": { + "description": "The ArmId of the keyVault where the customer owned encryption key is present.", + "type": "string" + }, "keyIdentifier": { "description": "Key vault uri to access the encryption key.", "type": "string" @@ -3228,7 +3232,8 @@ } }, "required": [ - "keyIdentifier" + "keyIdentifier", + "keyVaultArmId" ], "type": "object" } From 465c1c1a3d0c5505620750d02f639bdd31a4223f Mon Sep 17 00:00:00 2001 From: Deepthi Male Date: Thu, 2 Jan 2020 16:27:02 -0800 Subject: [PATCH 7/7] made encryption.status as required property --- .../stable/2020-01-01/machineLearningServices.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json index 0351b0e23906..b4ab6015b709 100644 --- a/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json +++ b/specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json @@ -3212,6 +3212,7 @@ } }, "required": [ + "status", "keyVaultProperties" ], "type": "object"