From 94ce88923f0cf7c7a415cc53db1edc4c500d8bea Mon Sep 17 00:00:00 2001 From: Jorge Baca <58745759+jorgbaca@users.noreply.github.com> Date: Mon, 27 Jul 2020 18:21:18 -0700 Subject: [PATCH] Update dataController onPremise property (#10263) * WIP: Updating Microsoft.AzureData * Minor changes * Adding new SystemData property to examples * Fixed formatting * Update azuredata.json Fixed systemData. * Update azuredata.json Fixed identitytype case. * Fixed formatting * Adding create data controller example properties * Removed extra file * Renamed parameter name * Ran prettier check --- .../preview/2019-07-24-preview/azuredata.json | 38 ++++++++++--------- .../CreateOrUpdateDataController.json | 25 ++++++++++-- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json b/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json index 306176fe6c91..7f52976db6c8 100644 --- a/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json +++ b/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json @@ -1518,6 +1518,15 @@ { "$ref": "#/parameters/resourceGroupName" }, + { + "name": "dataControllerResource", + "description": "desc", + "required": true, + "in": "body", + "schema": { + "$ref": "#/definitions/DataControllerResource" + } + }, { "name": "dataControllerName", "in": "path", @@ -2290,10 +2299,11 @@ } }, "DataControllerProperties": { + "description": "The data controller properties.", "type": "object", "properties": { - "dataController": { - "$ref": "#/definitions/DataController" + "onPremiseProperty": { + "$ref": "#/definitions/OnPremiseProperty" }, "requestType": { "$ref": "#/definitions/RequestType" @@ -2312,28 +2322,22 @@ } } }, - "DataController": { + "OnPremiseProperty": { + "description": "Properties from the on premise data controller", "type": "object", "properties": { "id": { "type": "string", - "format": "uuid" - }, - "name": { - "type": "string" - }, - "azureResourceType": { - "type": "string" + "format": "uuid", + "description": "A globally unique ID identifying the associated on premise cluster" }, - "subscription": { + "publicSigningKey": { "type": "string", - "format": "uuid" - }, - "resourceGroup": { - "type": "string" + "description": "Certificate that contains the on premise cluster public key used to verify signing" }, - "location": { - "type": "string" + "signingCertificateThumbprint": { + "type": "string", + "description": "Unique thumbprint returned to customer to verify the certificate being uploaded" } } }, diff --git a/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateDataController.json b/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateDataController.json index 2977f808ef85..74731c2ddcff 100644 --- a/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateDataController.json +++ b/specification/azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateDataController.json @@ -4,18 +4,29 @@ "resourceGroupName": "testrg", "dataControllerName": "testdataController", "api-version": "2017-07-24", - "parameters": { + "dataControllerResource": { "location": "northeurope", "tags": { "mytag": "myval" }, - "properties": {} + "properties": { + "onPremiseProperty": { + "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", + "publicSigningKey": "publicOnPremSigningKey" + } + } } }, "responses": { "200": { "body": { - "properties": {}, + "properties": { + "onPremiseProperty": { + "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", + "publicSigningKey": "publicOnPremSigningKey", + "signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded" + } + }, "systemData": { "createdBy": "user1", "createdByType": "user", @@ -35,7 +46,13 @@ }, "201": { "body": { - "properties": {}, + "properties": { + "onPremiseProperty": { + "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", + "publicSigningKey": "publicOnPremSigningKey", + "signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded" + } + }, "location": "northeurope", "systemData": { "createdBy": "user1",