From 8f5064c6d319b643f06beecd176747d6a7023dce Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Tue, 6 Dec 2022 16:16:23 -0800 Subject: [PATCH 1/3] Fixing Access Connector Swagger Correctness --- .../preview/2022-04-01-preview/accessconnector.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/accessconnector.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/accessconnector.json index e1d44fa4def0..fb20d55e2bbb 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/accessconnector.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/accessconnector.json @@ -318,6 +318,10 @@ "identity": { "$ref": "#/definitions/IdentityData" }, + "systemData": { + "description": "The system metadata relating to this resource", + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/systemData" + }, "properties": { "description": "Azure Databricks accessConnector properties", "$ref": "#/definitions/AccessConnectorProperties" From 0f4006dc2f5a1390583ed2602a28c8cdf5253c30 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Wed, 7 Dec 2022 14:08:02 -0800 Subject: [PATCH 2/3] Addressing Swagger Correctness Issues --- .../preview/2022-04-01-preview/databricks.json | 15 +++++++++++++-- .../examples/ListPrivateEndpointConnections.json | 2 +- .../examples/PrivateEndpointConnectionsGet.json | 2 +- .../PrivateEndpointConnectionsUpdate.json | 4 ++-- .../examples/WorkspaceGetParameters.json | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json index f29f2d54dd86..7c7207655d87 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json @@ -1413,7 +1413,7 @@ "description": "The object that represents the operation.", "properties": { "provider": { - "description": "Service provider: Microsoft.ResourceProvider", + "description": "Service provider: ex Microsoft.Databricks", "type": "string" }, "resource": { @@ -1423,6 +1423,10 @@ "operation": { "description": "Operation type: Read, write, delete, etc.", "type": "string" + }, + "description": { + "description": "Description for the resource operation.", + "type": "string" } } } @@ -1578,6 +1582,13 @@ "description": "Private endpoint", "$ref": "#/definitions/PrivateEndpoint" }, + "groupIds": { + "type": "array", + "description": "GroupIds from the private link service resource.", + "items": { + "type": "string" + } + }, "privateLinkServiceConnectionState": { "title": "Private link service service connection state", "description": "Private endpoint connection state", @@ -1625,7 +1636,7 @@ "type": "string", "description": "The description for the current state of a private endpoint connection" }, - "actionRequired": { + "actionsRequired": { "type": "string", "description": "Actions required for a private endpoint connection" } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateEndpointConnections.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateEndpointConnections.json index ed59ac4583e7..e821186441c8 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateEndpointConnections.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/ListPrivateEndpointConnections.json @@ -20,7 +20,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Approved by johndoe@company.com", - "actionRequired": "None" + "actionsRequired": "None" }, "provisioningState": "Succeeded" } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsGet.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsGet.json index bbc32f367219..b07e6171ac2c 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsGet.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsGet.json @@ -19,7 +19,7 @@ "privateLinkServiceConnectionState": { "status": "Pending", "description": "Please approve my request!", - "actionRequired": "None" + "actionsRequired": "None" }, "provisioningState": "Succeeded" } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsUpdate.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsUpdate.json index bb091929d565..cd6c8e9349a9 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsUpdate.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsUpdate.json @@ -27,7 +27,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Approved by databricksadmin@contoso.com", - "actionRequired": "None" + "actionsRequired": "None" }, "provisioningState": "Succeeded" } @@ -45,7 +45,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Approved by databricksadmin@contoso.com", - "actionRequired": "None" + "actionsRequired": "None" }, "provisioningState": "Succeeded" } diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGetParameters.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGetParameters.json index ac0c996e4dd7..f49078481721 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGetParameters.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceGetParameters.json @@ -65,7 +65,7 @@ "privateLinkServiceConnectionState": { "status": "Approved", "description": "Auto-Approved", - "actionRequired": "None" + "actionsRequired": "None" }, "provisioningState": "Succeeded" } From fa9897b9b063b2c5043025cf8255dcf164f93115 Mon Sep 17 00:00:00 2001 From: Subrahmanyam Veera Mandavilli Date: Mon, 12 Dec 2022 11:01:38 -0800 Subject: [PATCH 3/3] Fixing diskEncryptionSetId readOnly attribute --- .../preview/2022-04-01-preview/databricks.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json index 7c7207655d87..dd7ed36376df 100644 --- a/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json +++ b/specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json @@ -795,6 +795,7 @@ "$ref": "#/definitions/ManagedIdentityConfiguration" }, "diskEncryptionSetId": { + "readOnly": true, "type": "string", "description": "The resource Id of the managed disk encryption set." },