Skip to content
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

Update dataController onPremise property #10263

Merged
merged 14 commits into from
Jul 28, 2020
Merged

Update dataController onPremise property #10263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
11ce62d
WIP: Updating Microsoft.AzureData
jorgbaca Jul 20, 2020
4c74ee7
Merge remote-tracking branch 'azure-remote/master'
jorgbaca Jul 20, 2020
e44ca90
Minor changes
jorgbaca Jul 20, 2020
e55b9bd
Adding new SystemData property to examples
jorgbaca Jul 20, 2020
a5ee8a3
Fixed formatting
jorgbaca Jul 20, 2020
7337b93
Update azuredata.json
jorgbaca Jul 20, 2020
78e2146
Update azuredata.json
jorgbaca Jul 20, 2020
7f7d4bf
Fixed formatting
jorgbaca Jul 21, 2020
b35a214
Merge remote-tracking branch 'azure-remote/master'
jorgbaca Jul 21, 2020
aac8219
Merge remote-tracking branch 'azure-remote/master' into updateDataCon…
jorgbaca Jul 27, 2020
60ba789
Adding create data controller example properties
jorgbaca Jul 27, 2020
89ecd4d
Removed extra file
jorgbaca Jul 27, 2020
497f420
Renamed parameter name
jorgbaca Jul 27, 2020
967a5b5
Ran prettier check
jorgbaca Jul 27, 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
38 changes: 21 additions & 17 deletions .../azuredata/resource-manager/Microsoft.AzureData/preview/2019-07-24-preview/azuredata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,6 +1518,15 @@
{
"$ref": "#/parameters/resourceGroupName"
},
{
"name": "dataControllerResource",
"description": "desc",
"required": true,
"in": "body",
"schema": {
"$ref": "#/definitions/DataControllerResource"
}
},
{
"name": "dataControllerName",
"in": "path",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
}
}
},
Expand Down
25 changes: 21 additions & 4 deletions ...Microsoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateDataController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down