Skip to content

Ready to merge : Workspace: Swagger updates for CMK #7967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArcturusZhang merged 7 commits into from
Jan 14, 2020
Merged

Ready to merge : Workspace: Swagger updates for CMK #7967

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0eae57b
Workspace: Swagger updates for CMK
DeMale Dec 11, 2019
7937fb6
PR comments
DeMale Dec 12, 2019
045a841
PR comments fixes
vrushg-ms Dec 17, 2019
c10e140
marked as required
DeMale Dec 18, 2019
4b23687
marked as required
DeMale Dec 18, 2019
97109ea
added KeyVault armId to encryption.keyVaultProperties
DeMale Dec 21, 2019
465c1c1
made encryption.status as required property
DeMale Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions ...manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/createWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@
"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",
"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
}
}
},
Expand All @@ -39,7 +47,15 @@
"discoveryUrl": "http://example.com",
"creationTime": "2017-03-01T23:14:37.0707808Z",
"friendlyName": "HelloName",
"description": "test description"
"description": "test description",
"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
}
}
},
Expand All @@ -61,7 +77,15 @@
"discoveryUrl": "http://example.com",
"creationTime": "2017-03-01T23:14:37.0707808Z",
"friendlyName": "HelloName",
"description": "test description"
"description": "test description",
"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
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion ...ce-manager/Microsoft.MachineLearningServices/stable/2020-01-01/examples/getWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@
"discoveryUrl": "http://example.com",
"creationTime": "2017-03-01T23:14:37.0707808Z",
"friendlyName": "HelloName",
"description": "test description"
"description": "test description",
"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
}
}
}
Expand Down
45 changes: 44 additions & 1 deletion ...-manager/Microsoft.MachineLearningServices/stable/2020-01-01/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,6 +1452,15 @@
},
"readOnly": true,
"description": "The current deployment state of workspace resource. The provisioningState is to indicate states for resource provisioning."
},
"encryption": {
"$ref": "#/definitions/EncryptionProperty",
"description": "The encryption settings of Azure ML workspace."
},
"hbiWorkspace": {
"type": "boolean",
"description": "The flag to signal HBI data in the workspace and reduce diagnostic data collected by the service",
"default": false
}
}
},
Expand Down Expand Up @@ -3182,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"
}
}
}
}
}