From 89300d44d4e38be3da5decc318ca8d8814fb3e7b Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Thu, 18 Jun 2020 21:21:13 -0700 Subject: [PATCH 1/4] Databricks Swagger Changes for Double Encryption --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 26055abe6cff..d01a7f66e698 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -814,6 +814,11 @@ "enableNoPublicIp": { "$ref": "#/definitions/WorkspaceCustomBooleanParameter", "description": "Should the Public IP be Disabled?" + }, + "enableDoubleEncryption": { + "type": "#/definitions/WorkspaceCustomBooleanParameter", + "x-ms-client-name": "EnableDoubleEncryption", + "description": "A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest." } }, "description": "Custom Parameters used for Cluster Creation." From 3c6bec8980a16925dff4b29835b7103c7c168f75 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Tue, 23 Jun 2020 15:52:10 -0700 Subject: [PATCH 2/4] Update Double Encryption Property Name --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index d01a7f66e698..6d85206f5a2c 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -815,9 +815,9 @@ "$ref": "#/definitions/WorkspaceCustomBooleanParameter", "description": "Should the Public IP be Disabled?" }, - "enableDoubleEncryption": { + "requireInfrastructureEncryption": { "type": "#/definitions/WorkspaceCustomBooleanParameter", - "x-ms-client-name": "EnableDoubleEncryption", + "x-ms-client-name": "requireInfrastructureEncryption", "description": "A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest." } }, From 1fe99154ae0a44b8fa91961df58bc236b2cebe41 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Mon, 13 Jul 2020 23:40:52 -0700 Subject: [PATCH 3/4] removed x-ms-client-name --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 5cd65b22929b..41e0c2a86bd0 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -861,7 +861,6 @@ }, "requireInfrastructureEncryption": { "type": "#/definitions/WorkspaceCustomBooleanParameter", - "x-ms-client-name": "requireInfrastructureEncryption", "description": "A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest." } }, From e63a15f4648deddf32ddf62d53c5b6eefc250ca1 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Tue, 14 Jul 2020 11:56:06 -0700 Subject: [PATCH 4/4] Fixing errors in model --- .../Microsoft.Databricks/stable/2018-04-01/databricks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json index 41e0c2a86bd0..9d7ec3fc26bc 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json @@ -860,7 +860,7 @@ "description": "Contains the encryption details for Customer-Managed Key (CMK) enabled workspace." }, "requireInfrastructureEncryption": { - "type": "#/definitions/WorkspaceCustomBooleanParameter", + "$ref": "#/definitions/WorkspaceCustomBooleanParameter", "description": "A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest." } },