Add Encryption to Synapse Workspace Patch properties (Azure#12042)

* Add Patch Workspace properties * Update UpdateWorkspace.json Co-authored-by: Eduardo Coronado <edcorona@microsoft.com>
dabenhamMic · Dec 14, 2020 · 3a2e255 · 3a2e255
1 parent 407b77e
commit 3a2e255
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 4 deletions.
diff --git a/...anager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json b/...anager/Microsoft.Synapse/preview/2019-06-01-preview/examples/CreateOrUpdateWorkspace.json
@@ -35,6 +35,14 @@
           "repositoryName": "myrepository",
           "collaborationBranch": "master",
           "rootFolder": "/"
+        },
+        "encryption": {
+          "cmk": {
+            "key": {
+              "name": "default",
+              "keyVaultUrl": "https://vault.azure.net/keys/key1"
+            }
+          }
         }
       },
       "location": "East US",
@@ -96,7 +104,17 @@
               }
             }
           ],
-          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d",
+          "encryption": {
+            "doubleEncryptionEnabled": true,
+            "cmk": {
+              "status": "Consistent",
+              "key": {
+                "name": "default",
+                "keyVaultUrl": "https://vault.azure.net/keys/key1"
+              }
+            }
+          }
         },
         "tags": {
           "key": "value"
@@ -132,7 +150,17 @@
           "managedResourceGroupName": "workspaceManagedResourceGroupUnique",
           "managedVirtualNetwork": "default",
           "provisioningState": "Provisioning",
-          "workspaceUID": "86984b43-b873-4b91-bacd-2ca083a104c7"
+          "workspaceUID": "86984b43-b873-4b91-bacd-2ca083a104c7",
+          "encryption": {
+            "doubleEncryptionEnabled": true,
+            "cmk": {
+              "status": "Updating",
+              "key": {
+                "name": "default",
+                "keyVaultUrl": "https://vault.azure.net/keys/key1"
+              }
+            }
+          }
         },
         "tags": {
           "key": "value"

diff --git a/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json b/...source-manager/Microsoft.Synapse/preview/2019-06-01-preview/examples/UpdateWorkspace.json
@@ -31,6 +31,14 @@
         },
         "purviewConfiguration": {
           "purviewResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/resourceGroup1/providers/Microsoft.ProjectPurview/accounts/accountname1"
+        },
+        "encryption": {
+          "cmk": {
+            "key": {
+              "name": "default",
+              "keyVaultUrl": "https://vault.azure.net/keys/key1"
+            }
+          }
         }
       }
     }
@@ -64,7 +72,17 @@
           "sqlAdministratorLogin": "login",
           "managedResourceGroupName": "resourceGroup2",
           "provisioningState": "Succeeded",
-          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d",
+          "encryption": {
+            "doubleEncryptionEnabled": true,
+            "cmk": {
+              "status": "Consistent",
+              "key": {
+                "name": "default",
+                "keyVaultUrl": "https://vault.azure.net/keys/key1"
+              }
+            }
+          }
         },
         "tags": {
           "key": "value"
@@ -99,7 +117,17 @@
           "sqlAdministratorLogin": "login",
           "managedResourceGroupName": "resourceGroup2",
           "provisioningState": "Provisioning",
-          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d"
+          "workspaceUID": "999b999q-b888-4b44-bacd-2c222cc2222d",
+          "encryption": {
+            "doubleEncryptionEnabled": true,
+            "cmk": {
+              "status": "Updating",
+              "key": {
+                "name": "default",
+                "keyVaultUrl": "https://vault.azure.net/keys/key1"
+              }
+            }
+          }
         },
         "tags": {
           "key": "value"

diff --git a/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json b/...tion/synapse/resource-manager/Microsoft.Synapse/preview/2019-06-01-preview/workspace.json
@@ -1256,6 +1256,10 @@
           "description": "Resource provisioning state",
           "type": "string",
           "readOnly": true
+        },
+        "encryption": {
+          "description": "The encryption details of the workspace",
+          "$ref": "#/definitions/EncryptionDetails"
         }
       }
     },