Skip to content

Adding SystemData property to Microsoft.AzureData #10202

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

Merged
merged 10 commits into from
Jul 22, 2020
Merged

Adding SystemData property to Microsoft.AzureData #10202

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 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
d0468ae
Removing changes from this PR (suggested by ARM). Will send a differe…
jorgbaca Jul 21, 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
79 changes: 62 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 @@ -2019,6 +2019,10 @@
"create"
],
"description": "The geo-location where the resource lives"
},
"systemData": {
"$ref": "#/definitions/SystemData",
"readOnly": true
}
},
"required": [
Expand Down Expand Up @@ -2218,6 +2222,52 @@
}
}
},
"SystemData": {
"description": "Read only system data",
"type": "object",
"properties": {
"createdBy": {
"type": "string",
"description": "An identifier for the identity that created the resource"
},
"createdByType": {
"$ref": "#/definitions/IdentityType",
"description": "The type of identity that created the resource"
},
"createdAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of resource creation (UTC)"
},
"lastModifiedBy": {
"type": "string",
"description": "An identifier for the identity that last modified the resource"
},
"lastModifiedByType": {
"$ref": "#/definitions/IdentityType",
"description": "The type of identity that last modified the resource"
},
"lastModifiedAt": {
"type": "string",
"format": "date-time",
"description": "The timestamp of resource last modification (UTC)"
}
}
},
"IdentityType": {
"description": "The type of identity that creates/modifies resources",
"type": "string",
"enum": [
"user",
"application",
"managedIdentity",
"key"
],
"x-ms-enum": {
"name": "IdentityType",
"modelAsString": true
}
},
"ResourceSku": {
"type": "object",
"properties": {
Expand All @@ -2240,10 +2290,11 @@
}
},
"DataControllerProperties": {
"description": "The data controller properties.",
"type": "object",
"properties": {
"dataController": {
"$ref": "#/definitions/DataController"
"onPremiseProperty": {
"$ref": "#/definitions/OnPremiseProperty"
},
Copy link
Member

@ArcturusZhang ArcturusZhang Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change relevant with this change on adding of systemData? If not, I suggest to revert this and maybe open another PR specified with replacing this attribute

Copy link
Contributor Author

@jorgbaca jorgbaca Jul 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ArcturusZhang , this is not relevant to adding systemData. I removed this from this PR and will send out a different one for it, as you suggested.

Copy link
Member

@ArcturusZhang ArcturusZhang Jul 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And a heads-up that that change would cause breaking changes warnings

"requestType": {
"$ref": "#/definitions/RequestType"
Expand All @@ -2262,28 +2313,22 @@
}
}
},
"DataController": {
"OnPremiseProperty": {
"description": "Properties from the on premise data controller",
"type": "object",
"properties": {
"id": {
"type": "string",
"format": "uuid"
},
"name": {
"type": "string"
"format": "uuid",
"description": "A globally unique ID identifying the associated on premise cluster"
},
"azureResourceType": {
"type": "string"
},
"subscription": {
"publicSigningKey": {
"type": "string",
"format": "uuid"
"description": "Certificate that contains the on premise cluster public key used to verify signing"
},
"resourceGroup": {
"type": "string"
},
"location": {
"type": "string"
"signingCertificateThumbprint": {
"type": "string",
"description": "Unique thumbprint returned to customer to verify the certificate being uploaded"
}
}
},
Expand Down
16 changes: 16 additions & 0 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 @@ -16,6 +16,14 @@
"200": {
"body": {
"properties": {},
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"location": "northeurope",
"tags": {
"mytag": "myval"
Expand All @@ -29,6 +37,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ...crosoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdatePostgresInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -29,6 +37,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ...osoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateSqlManagedInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -29,6 +37,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ...rosoft.AzureData/preview/2019-07-24-preview/examples/CreateOrUpdateSqlServerInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@
"status": "Connected"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -51,6 +59,14 @@
"status": "Connected"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
8 changes: 8 additions & 0 deletions ...ce-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/GetDataController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
8 changes: 8 additions & 0 deletions ...-manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/GetPostgresInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
8 changes: 8 additions & 0 deletions ...anager/Microsoft.AzureData/preview/2019-07-24-preview/examples/GetSqlManagedInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@
"body": {
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
8 changes: 8 additions & 0 deletions ...manager/Microsoft.AzureData/preview/2019-07-24-preview/examples/GetSqlServerInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
"status": "Connected"
},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ...soft.AzureData/preview/2019-07-24-preview/examples/ListByResourceGroupDataController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -21,6 +29,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ...ft.AzureData/preview/2019-07-24-preview/examples/ListByResourceGroupPostgresInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -21,6 +29,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
16 changes: 16 additions & 0 deletions ....AzureData/preview/2019-07-24-preview/examples/ListByResourceGroupSqlManagedInstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand All @@ -21,6 +29,14 @@
{
"properties": {},
"location": "northeurope",
"systemData": {
"createdBy": "user1",
"createdByType": "user",
"createdAt": "2020-01-01T17:18:19.1234567Z",
"lastModifiedBy": "user2",
"lastModifiedByType": "user",
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
},
"tags": {
"mytag": "myval"
},
Expand Down
Loading